Modified to reset listener cb only if dbus is disconnected

Change-Id: I51ebf2a2ad1da9f986e38483014044dc0b039e5a
Signed-off-by: kmook <kmook.choi@samsung.com>

diff --git a/daemon/service_provider/AppCommServiceProvider.cpp b/daemon/service_provider/AppCommServiceProvider.cpp
index 677d9405b7863868f12a52cecc3d1164e2d3336c..d9de3b9c86b81e489f7e774d0d1731acf46665e8 100755 (executable)
--- a/daemon/service_provider/AppCommServiceProvider.cpp
+++ b/daemon/service_provider/AppCommServiceProvider.cpp
@@ -156,14 +156,6 @@ static void _dbusDisconnectListenerFreeCallback(gpointer userData)
                return;
        }
 
-       conv::AppCommServiceInfo *svcInfo = reinterpret_cast<conv::AppCommServiceInfo*>(_requestObj->getServiceInfo());
-
-       if (svcInfo->registeredRequest != NULL) {
-               delete svcInfo->registeredRequest;
-               svcInfo->registeredRequest = NULL;
-               _D("registeredRequest deleted");
-       }
-
        delete _requestObj;
        _requestObj = NULL;
 }
@@ -184,6 +176,15 @@ static void _dbusDisconnectListener(GDBusConnection* conn, const gchar* sender,
                _D("Detected the dbus disconnection.");
 
                _requestObj->setIsConnect(false);
+
+               conv::AppCommServiceInfo *svcInfo = reinterpret_cast<conv::AppCommServiceInfo*>(_requestObj->getServiceInfo());
+
+               if (svcInfo->registeredRequest != NULL) {
+                       delete svcInfo->registeredRequest;
+                       svcInfo->registeredRequest = NULL;
+                       _D("registeredRequest deleted");
+               }
+
                stop_request(_requestObj);
 
                _D("request stop");

diff --git a/daemon/service_provider/RemoteAppControlServiceProvider.cpp b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
index 001c5c3a85de448bc096da5baef44c15ef396e99..3557d682615f8b71bccb66c51f361fd08ce3ccbe 100755 (executable)
--- a/daemon/service_provider/RemoteAppControlServiceProvider.cpp
+++ b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
@@ -827,13 +827,6 @@ static void _dbusDisconnectListenerFreeCallback(gpointer userData)
                return;
        }
 
-       conv::RemoteAppControlServiceInfo *svcInfo = reinterpret_cast<conv::RemoteAppControlServiceInfo*>(_requestObj->getServiceInfo());
-
-       if (svcInfo->registeredRequest != NULL) {
-               delete svcInfo->registeredRequest;
-               svcInfo->registeredRequest = NULL;
-       }
-
        delete _requestObj;
        _requestObj = NULL;
 }
@@ -854,6 +847,15 @@ static void _dbusDisconnectListener(GDBusConnection* conn, const gchar* sender,
                _D("Detected the dbus disconnection.");
 
                _requestObj->setIsConnect(false);
+
+               conv::RemoteAppControlServiceInfo *svcInfo = reinterpret_cast<conv::RemoteAppControlServiceInfo*>(_requestObj->getServiceInfo());
+
+               if (svcInfo->registeredRequest != NULL) {
+                       delete svcInfo->registeredRequest;
+                       svcInfo->registeredRequest = NULL;
+                       _D("registeredRequest deleted");
+               }
+
                stop_request(_requestObj);
 
                _D("request stop");