Fix event subscribe exception

Change-Id: I86858a1266d48e2ee5d7ebfef560b1bc0c7f25dc
Signed-off-by: Joohyun Kim <joohyune.kim@samsung.com>

diff --git a/src/system/FSys_SettingClient.cpp b/src/system/FSys_SettingClient.cpp
index e0c1098..9bec551 100644 (file)
--- a/src/system/FSys_SettingClient.cpp
+++ b/src/system/FSys_SettingClient.cpp
@@ -1011,7 +1011,11 @@ _SettingClient::AddSettingEventListener(ISettingEventListener& listener)
        SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to add event listener.");
 
        r = SubscribeEvent();
-       SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to request to add event listener.");
+       SysLog(NID_SYS, "Event Subscription Result is %s.", GetErrorMessage(r));
+       if(r != E_SYSTEM)
+       {
+               r = E_SUCCESS;
+       }
 
        return r;
 }
@@ -1033,7 +1037,11 @@ _SettingClient::RemoveSettingEventListener(ISettingEventListener& listener)
        SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to remove event listener.[%s]", GetErrorMessage(r));
 
        r = SubscribeEvent();
-       SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to request to remove event listener.");
+       SysLog(NID_SYS, "Event Subscription Result is %s.", GetErrorMessage(r));
+       if(r != E_SYSTEM)
+       {
+               r = E_SUCCESS;
+       }
 
        return r;
 }
@@ -1057,7 +1065,11 @@ _SettingClient::AddSettingEventListenerForInternal(ISettingEventListener& listen
        SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to add event listener.");
 
        r = SubscribeEvent();
-       SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to request to add event listener.");
+       SysLog(NID_SYS, "Event Subscription Result is %s.", GetErrorMessage(r));
+       if(r != E_SYSTEM)
+       {
+               r = E_SUCCESS;
+       }
 
        return r;
 }
@@ -1075,7 +1087,11 @@ _SettingClient::RemoveSettingEventListenerForInternal(ISettingEventListener& lis
        SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to remove event listener.");
 
        r = SubscribeEvent();
-       SysTryReturnResult(NID_SYS, r == E_SUCCESS, r, "It is failed to request to remove event listener.");
+       SysLog(NID_SYS, "Event Subscription Result is %s.", GetErrorMessage(r));
+       if(r != E_SYSTEM)
+       {
+               r = E_SUCCESS;
+       }
 
        return r;
 }