Fix Error handling issues

Change-Id: I7e688a6e7c032b777da584dfc148aeee1008e444

diff --git a/src/system/FSys_DeviceManagerStub.cpp b/src/system/FSys_DeviceManagerStub.cpp
index d5e1593..0bc8a61 100644 (file)
--- a/src/system/FSys_DeviceManagerStub.cpp
+++ b/src/system/FSys_DeviceManagerStub.cpp
@@ -131,14 +131,17 @@ _DeviceManagerStub::Construct(void)
        __pDeviceManager = _DeviceManager::GetInstance();
        SysTryReturn(NID_SYS, __pDeviceManager, E_SYSTEM, E_SYSTEM,"It is failed to create DeviceManager instance.");
 
-        __pRegistry = new (std::nothrow) Registry();
-        SysTryReturn(NID_SYS, __pRegistry, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,"Memory is insufficient.");
+       __pRegistry = new (std::nothrow) Registry();
+       SysTryReturn(NID_SYS, __pRegistry, E_OUT_OF_MEMORY, E_OUT_OF_MEMORY,"Memory is insufficient.");
 
-        r = __pRegistry->Construct(DEVICE_MANAGER_REGISTRY_NAME, "a+");
-        SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "It is failed to open power manager registry.[%s]", GetErrorMessage(r));
+       r = __pRegistry->Construct(DEVICE_MANAGER_REGISTRY_NAME, "a+");
+       SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "It is failed to open device manager registry.[%s]", GetErrorMessage(r));
 
-        __pRegistry->AddSection(DEVICE_MANAGER_REGISTRY_SECTION);
-       __pRegistry->Flush();
+       r = __pRegistry->AddSection(DEVICE_MANAGER_REGISTRY_SECTION);
+       SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "It is failed to add device manager registry section.[%s]", GetErrorMessage(r));
+
+       r = __pRegistry->Flush();
+       SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "It is failed to flush device manager registry.[%s]", GetErrorMessage(r));
 
        __pIpcServer = move(pIpcServer);
 
@@ -187,15 +190,16 @@ _DeviceManagerStub::AddInterestedApp(AppId appId, int pid)
        result r = E_SUCCESS;
 
        if (__IsInitializedDevice == false)
-        {
-                r = __pDeviceManager->InitializeDevice();
-                SysTryReturn(NID_SYS, !IsFailed(r), , E_SYSTEM, "It is failed to init device");
-                __IsInitializedDevice = true;
+       {
+               r = __pDeviceManager->InitializeDevice();
+               SysTryReturn(NID_SYS, r == E_SUCCESS, , E_SYSTEM, "It is failed to init device");
+               __IsInitializedDevice = true;
                SysLog(NID_SYS, "InitializeDevice for BT");
-        }
+       }
        r = __pRegistry->AddValue(DEVICE_MANAGER_REGISTRY_SECTION, (String) appId, pid);
        SysLog(NID_SYS, "The result of adding pid is [%s]", GetErrorMessage(r));
-       __pRegistry->Flush();
+       r = __pRegistry->Flush();
+       SysTryReturnVoidResult(NID_SYS, r == E_SUCCESS, r, "It is failed to flush pid registry.[%s]", GetErrorMessage(r));
 }
 
 
@@ -208,7 +212,8 @@ _DeviceManagerStub::RemoveInterestedApp(AppId appId, int pid)
        }
        result r = __pRegistry->RemoveValue(DEVICE_MANAGER_REGISTRY_SECTION, (String) appId);
        SysLog(NID_SYS, "The result of removing pid is [%s]", GetErrorMessage(r));
-       __pRegistry->Flush();
+       r = __pRegistry->Flush();
+       SysTryReturnVoidResult(NID_SYS, r == E_SUCCESS, r, "It is failed to flush pid registry.[%s]", GetErrorMessage(r));
 
        IList* pInterestList = __pRegistry->GetAllEntryNamesN(DEVICE_MANAGER_REGISTRY_SECTION);
        SysTryReturn(NID_SYS, pInterestList, , E_SYSTEM, "It is failed to get registry.");

diff --git a/src/system/FSys_PowerManagerStub.cpp b/src/system/FSys_PowerManagerStub.cpp
index eb0799c..45bc393 100644 (file)
--- a/src/system/FSys_PowerManagerStub.cpp
+++ b/src/system/FSys_PowerManagerStub.cpp
@@ -127,7 +127,8 @@ _PowerManagerStub::Construct(void)
        r = __pRegistry->Construct(_POWER_MANAGER_REGISTRY_NAME, "a+");
        SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "It is failed to open power manager registry.[%s]", GetErrorMessage(r));
 
-       __pRegistry->AddSection(_POWER_MANAGER_REGISTRY_BRIGHTNESS_SECTION);
+       r = __pRegistry->AddSection(_POWER_MANAGER_REGISTRY_BRIGHTNESS_SECTION);
+       SysTryReturn(NID_SYS, r == E_SUCCESS, E_SYSTEM, r, "It is failed to add power manager registry brightness section.[%s]", GetErrorMessage(r));
 
        __pIpcServer = move(pIpcServer);
 
@@ -174,7 +175,9 @@ _PowerManagerStub::OnRequestOccured(const ArrayList& request, ArrayList* respons
 
        if (__activeAppId.IsEmpty())
        {
-               __pRegistry->GetValue(_POWER_MANAGER_REGISTRY_BRIGHTNESS_SECTION, _POWER_MANAGER_REGISTRY_ACTIVE_ID, __activeAppId);
+               r = __pRegistry->GetValue(_POWER_MANAGER_REGISTRY_BRIGHTNESS_SECTION, _POWER_MANAGER_REGISTRY_ACTIVE_ID, __activeAppId);
+               SysTryCatch(NID_SYS, r == E_SUCCESS, r = E_SYSTEM, r,
+                       "It is failed to get the active id from registry");
                SysLog(NID_SYS, "Get the active id from registry [%ls].", __activeAppId.GetPointer());
        }
 

diff --git a/src/system/FSys_SystemInfoService.cpp b/src/system/FSys_SystemInfoService.cpp
index 88bc3f2..5a35341 100644 (file)
--- a/src/system/FSys_SystemInfoService.cpp
+++ b/src/system/FSys_SystemInfoService.cpp
@@ -2655,7 +2655,9 @@ _SystemInfoService::CachingSystemInformation(void)
        else
        {
                FileAttributes attr;
-               File::GetAttributes(_SYSTEM_CACHING_FILE, attr);
+               r = File::GetAttributes(_SYSTEM_CACHING_FILE, attr);
+               SysTryReturnResult(NID_SYS, r == E_SUCCESS, E_SYSTEM, "It is failed to get file attributes. [%s]", GetErrorMessage(r));
+
                if(attr.GetFileSize() == 0)
                {
                        r = CreateCacheFile();
@@ -2665,7 +2667,6 @@ _SystemInfoService::CachingSystemInformation(void)
                        r = UpdateCacheFile();
                }
        }
-
        return r;
 }