Add retry logic to read DUID.

Change-Id: I25dc1709a9fd582048de87fb8b2e9b7124b6ea10
Signed-off-by: Hokwon Song <hokwon.song@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb48106..bf926b0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,6 @@ INCLUDE_DIRECTORIES (
        src/system
        src/ui
        /usr/include/osp/ui
-       /usr/include/osp/server/system
        )
 
 SET (${this_target}_SOURCE_FILES

diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
index 53a4678..e7101d3 100644 (file)
--- a/src/system/CMakeLists.txt
+++ b/src/system/CMakeLists.txt
@@ -7,7 +7,6 @@ INCLUDE_DIRECTORIES(
        /usr/include/network
        /usr/include/telephony
        /usr/include/telephony-client
-       /usr/include/osp/server/system
        ./
        )
 
@@ -27,6 +26,7 @@ pkg_check_modules(pkgs REQUIRED
         kies_alarm
         alarm-engine
         alarm-service
+       osp-system-server
 )
 
 ## SET EXTRA COMPILER FLAGS

diff --git a/src/system/FSys_SystemInfoService.cpp b/src/system/FSys_SystemInfoService.cpp
index 1ab5b5a..88bc3f2 100644 (file)
--- a/src/system/FSys_SystemInfoService.cpp
+++ b/src/system/FSys_SystemInfoService.cpp
@@ -2569,7 +2569,7 @@ _SystemInfoService::UpdateCacheFile(void)
        }
 
        r = reg.GetValue(_SYSTEM_CACHING_SECTION, _DUID, sValue);
-       if(r != E_SUCCESS)
+       if(r != E_SUCCESS || sValue == L"ERROR")
        {
                sValue.Clear();
                r = this->GetValue(_DUID, sValue);
@@ -2577,8 +2577,12 @@ _SystemInfoService::UpdateCacheFile(void)
                {
                        sValue.Append(L"ERROR");
                }
+               r = reg.AddValue(_SYSTEM_CACHING_SECTION, _DUID, sValue);
 
-               reg.AddValue(_SYSTEM_CACHING_SECTION, _DUID, sValue);
+               if (r == E_KEY_ALREADY_EXIST && sValue != L"ERROR")
+               {
+                       reg.SetValue(_SYSTEM_CACHING_SECTION, _DUID, sValue);
+               }
                reg.Flush();
        }