X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2FFIo_MessagePortStub.cpp;h=d244a9d219ee75775c06f1ce16ae7874c04f7377;hb=56cfec88fca31552c8e9ca8169bc02c060e97035;hp=0c06d06192f803733652cb937a3299e452ff13d6;hpb=e6f9164253823f2c17e3691a54f225c86e71c0a3;p=platform%2Fframework%2Fnative%2Fchannel-service.git

diff --git a/src/FIo_MessagePortStub.cpp b/src/FIo_MessagePortStub.cpp
index 0c06d06..d244a9d 100644
--- a/src/FIo_MessagePortStub.cpp
+++ b/src/FIo_MessagePortStub.cpp
@@ -36,13 +36,6 @@ using namespace Tizen::Base::Runtime;
 using namespace Tizen::Io;
 using namespace Tizen::App;
 
-static void 
-ConvertBundleToMap(const char *pKey, const int type, const bundle_keyval_t *pVal, void *pData)
-{
-	SysLog(NID_IO, "CB key = %s", pKey);
-
-}
-
 _MessagePortStub::_MessagePortStub(void)
 	: __pIpcServer(null)
 	, __pService(null)
@@ -52,7 +45,11 @@ _MessagePortStub::_MessagePortStub(void)
 
 _MessagePortStub::~_MessagePortStub(void)
 {
-	delete __pIpcServer;
+	if (__pIpcServer != null)
+	{
+		__pIpcServer->Stop();
+		delete __pIpcServer;
+	}
 }
 
 result
@@ -110,23 +107,24 @@ _MessagePortStub::OnCheckRemotePort(const BundleBuffer& buffer, int* pResult)
 }
 
 bool
-_MessagePortStub::OnSendMessage(const BundleBuffer& buffer, int* pResult)
+_MessagePortStub::OnSendMessage(const BundleBuffer& metadata, const BundleBuffer& buffer, int* pResult)
 {
 	SysAssertf(__pService != null, "MessagePort service has not been initialized.\n");
 
-	*pResult = __pService->SendMessage(buffer);
+	*pResult = __pService->SendMessage(metadata, buffer);
 
+	bundle_free(metadata.b);
 	bundle_free(buffer.b);
 
 	return true;
 }
 
 result
-_MessagePortStub::SendMessage(int clientId, const BundleBuffer& buffer)
+_MessagePortStub::SendMessage(int clientId, const BundleBuffer& metadata, const BundleBuffer& buffer)
 {
 	SysAssertf(__pService != null, "MessagePort service has not been initialized.\n");
 
-	result r = __pIpcServer->SendResponse(clientId, new MessagePort_sendMessageAsync(buffer));
+	result r = __pIpcServer->SendResponse(clientId, new MessagePort_sendMessageAsync(metadata, buffer));
 
 	SysTryReturnResult(NID_IO, r == E_SUCCESS, r, "Failed to send a response message.");