Fix bugs about port

Change-Id: I27dcf6553b5496255e2e87b379ba7f61b3b029c6
Signed-off-by: Junghoon Park <jh9216.park@samsung.com>

diff --git a/src/fdbroker-internal.cc b/src/fdbroker-internal.cc
index 36df52d..d0b53ee 100644 (file)
--- a/src/fdbroker-internal.cc
+++ b/src/fdbroker-internal.cc
@@ -246,13 +246,16 @@ int FdBroker::Send(const std::string& target_appid,
     return -1;
 
   if (mock_) {
-    (*fds)[0] = main_sock_pair.Detach(SocketPair::RECEIVER);
-    (*fds)[1] = delegate_sock_pair.Detach(SocketPair::RECEIVER);
-    int ret = DBusMock::GetInst().Send("TestApp", port_name, *fds);
+    int send_fds[2];
+    send_fds[0] = main_sock_pair.Detach(SocketPair::RECEIVER);
+    send_fds[1] = delegate_sock_pair.Detach(SocketPair::RECEIVER);
+    int ret = DBusMock::GetInst().Send("TestApp", port_name, send_fds);
     if (ret < 0)
       return ret;
 
-    return main_sock_pair.Detach(SocketPair::SENDER);
+    (*fds)[0] = main_sock_pair.Detach(SocketPair::SENDER);
+    (*fds)[1] = delegate_sock_pair.Detach(SocketPair::SENDER);
+    return (*fds)[0];
   }
 
   if (fd_list.Add(main_sock_pair.Detach(SocketPair::RECEIVER)) != 0)

diff --git a/src/proxy-internal.cc b/src/proxy-internal.cc
index f5bd629..bdda25c 100644 (file)
--- a/src/proxy-internal.cc
+++ b/src/proxy-internal.cc
@@ -73,7 +73,8 @@ gboolean Proxy::OnDataReceived(GIOChannel *gio, GIOCondition cond,
       IEventListener* listener = proxy->listener_;
       proxy->listener_ = nullptr;
       proxy->main_port_.get()->SetSource(0);
-      listener->OnDisconnected(proxy->target_appid_);
+      if (listener)
+        listener->OnDisconnected(proxy->target_appid_);
       return FALSE;
     }
 
@@ -200,7 +201,7 @@ void Proxy::ProxyPort::SetDisconnectedSource(int sourceId) {
 }
 
 void Proxy::ProxyPort::SetSource(int sourceId) {
-  disconn_src_ = sourceId;
+  src_ = sourceId;
 }
 
 }  // namespace internal