Add defensive codes for broken AppRegistry file

[platform/framework/native/appfw.git] / src / app / FApp_AppControlRegistry.cpp

diff --git a/src/app/FApp_AppControlRegistry.cpp b/src/app/FApp_AppControlRegistry.cpp
index 6c97827..2775ba4 100644 (file)
--- a/src/app/FApp_AppControlRegistry.cpp
+++ b/src/app/FApp_AppControlRegistry.cpp
@@ -52,12 +52,9 @@ const wchar_t ACTL_DEFAULT_FILE[] = L"/usr/etc/app-control-info.ini";
 const wchar_t ACTL_LEGACY_FILE[] = L"/usr/etc/app-control-alias.ini";
 const wchar_t ACTL_DEFAULT_PLUGIN[] = L"libosp-ac-platform.so";
 
-const wchar_t TIZEN_ALIAS_APPID_PREFIX[] = L"tizen.";
-
 const String ACTL_REGISTRY_PATH = L"Path";
 const String ACTL_REGISTRY_ALIAS_PROVIDER = L"PROVIDER_ALIAS";
 
-const int PKG_APPID_LEN = 256;
 const int REG_VALUE_BUFFER_LEN = 256;
 
 }
@@ -107,7 +104,11 @@ _AppControlRegistry::LoadTizenAppControlRegistry(void)
        const String regPath = ACTL_DEFAULT_FILE;
 
        result r = reg.Construct(regPath, REG_OPEN_READ_ONLY, null);
-       SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
+       if (IsFailed(r))
+       {
+               SysPropagate(NID_APP, r);
+               return r;
+       }
 
        const int secCount = reg.GetAllSectionCount();
        SysTryReturnResult(NID_APP, !(secCount <= 0), E_OBJ_NOT_FOUND, "Registry contains no data.");
@@ -156,7 +157,11 @@ _AppControlRegistry::LoadLegacyList(void)
        const String& regPath(ACTL_LEGACY_FILE);
 
        result r = reg.Construct(regPath, REG_OPEN_READ_ONLY, null);
-       SysTryReturn(NID_APP, !IsFailed(r), r, r, "[%s] Propagating.", GetErrorMessage(r));
+       if (IsFailed(r))
+       {
+               SysPropagate(NID_APP, r);
+               return r;
+       }
 
        const int sec_count = reg.GetAllSectionCount();
        SysTryReturnResult(NID_APP, !(sec_count <= 0), E_OBJ_NOT_FOUND, "Registry contains no data.");
@@ -205,7 +210,7 @@ _AppControlRegistry::LoadLegacyList(void)
                        r = reg.GetValue(secName, *pStr, value);
                        if (IsFailed(r))
                        {
-                               SysLog(NID_APP, "[%s] Propagating.", GetErrorMessage(r));
+                               SysPropagate(NID_APP, r);
                                continue;
                        }
 
@@ -260,7 +265,6 @@ _AppControlRegistry::GetTizenAppControlN(const String& aId, const String& oId) c
        SysLog(NID_APP, "Found matching AppControl (%ls, %ls)", pAppId->GetPointer(), pOperation->GetPointer());
 
        const String& soName = GetTizenAppControlProvider(*pAppId, *pOperation);
-       SysAssert(!soName.IsEmpty());
 
        return _AppControlImpl::CreateN(soName, *pAppId, *pOperation, _APPCONTROL_PROPERTY_PUBLIC);
 }