Merge "remove capi-appfw-app-manager dependency" into devel_3.0_main

[platform/framework/native/appfw.git] / src / io / FIo_LocalMessagePortImpl.cpp

diff --git a/src/io/FIo_LocalMessagePortImpl.cpp b/src/io/FIo_LocalMessagePortImpl.cpp
index d25f73d..b2fec4a 100644 (file)
--- a/src/io/FIo_LocalMessagePortImpl.cpp
+++ b/src/io/FIo_LocalMessagePortImpl.cpp
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -48,9 +47,14 @@ class _MessagePortEventArg
        : public IEventArg
 {
 public:
-       _MessagePortEventArg()
+       _MessagePortEventArg(IMap* pMap)
                : __pRemotePort(null)
-               , __pMap(null)
+               , __pMap(pMap)
+       {
+       }
+       _MessagePortEventArg(RemoteMessagePort* pRemotePort, IMap* pMap)
+               : __pRemotePort(pRemotePort)
+               , __pMap(pMap)
        {
        }
        RemoteMessagePort* __pRemotePort;
@@ -137,10 +141,11 @@ _LocalMessagePortImpl::IsTrusted(void) const
 void
 _LocalMessagePortImpl::OnMessageReceivedN(IMap* pMap)
 {
-       _MessagePortEventArg* pEventArg= new (std::nothrow) _MessagePortEventArg();
+       SysLog(NID_IO, "A message is received.");
+
+       _MessagePortEventArg* pEventArg= new (std::nothrow) _MessagePortEventArg(pMap);
        if(pEventArg != null)
        {
-               pEventArg->__pMap = pMap;
                __pEvent->Fire(*pEventArg);
        }
 }
@@ -155,11 +160,9 @@ _LocalMessagePortImpl::OnMessageReceivedN(const AppId& remoteAppId, const String
 
        RemoteMessagePort* pRemotePort = pManager->GetRemoteMessagePort(remoteAppId, remotePort, isTrusted);
 
-       _MessagePortEventArg* pEventArg = new (std::nothrow) _MessagePortEventArg();
+       _MessagePortEventArg* pEventArg = new (std::nothrow) _MessagePortEventArg(pRemotePort, pMap);
        if(pEventArg != null)
        {
-               pEventArg->__pRemotePort = pRemotePort;
-               pEventArg->__pMap = pMap;
                __pEvent->Fire(*pEventArg);
        }
 }
@@ -176,7 +179,7 @@ _LocalMessagePortImpl::GetMessagePort(const String& port, bool isTrusted)
        SysTryCatch(NID_IO, pImpl != null, , E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient.");
 
        r = pImpl->Construct(port, isTrusted);
-       SysTryCatch(NID_IO, r == E_SUCCESS, , E_SYSTEM, "[E_SYSTEM] Failed to initialize a message port.");
+       SysTryCatch(NID_IO, r == E_SUCCESS, , r, "[%s] Propagating.", GetErrorMessage(r));
 
        pLocalMessagePort->__pLocalMessagePortImpl = pImpl.release();