Modified to reset listener cb only if dbus is disconnected.

Signed-off-by: Segwon <segwon.han@samsung.com>

diff --git a/daemon/service_provider/AppCommServiceProvider.cpp b/daemon/service_provider/AppCommServiceProvider.cpp
index 0f7cd65390b0f6399f4c5e0aef72e12326610795..607a3afc6b1388a683112234dea3c993cc091f53 100755 (executable)
--- a/daemon/service_provider/AppCommServiceProvider.cpp
+++ b/daemon/service_provider/AppCommServiceProvider.cpp
@@ -156,13 +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;
-       }
-
        delete _requestObj;
        _requestObj = NULL;
 }
@@ -183,6 +176,14 @@ 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;
+               }
+
                stop_request(_requestObj);
 
                _D("request stop");

diff --git a/daemon/service_provider/RemoteAppControlServiceProvider.cpp b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
index 190d498b4d894b11b8e5b60890295d1baa5e52ed..58e3c64a31da512c8d60a449ef3d070bc630d656 100755 (executable)
--- a/daemon/service_provider/RemoteAppControlServiceProvider.cpp
+++ b/daemon/service_provider/RemoteAppControlServiceProvider.cpp
@@ -829,13 +829,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;
 }
@@ -856,6 +849,14 @@ 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;
+               }
+
                stop_request(_requestObj);
 
                _D("request stop");