Fix bug for ResourceCacheManager.

change definition value to milliseconds for time.
add prefix and suffix for definition value.

Change-Id: I7f8496f3ac0d95e206a46b1d90ff896fe019bdb5
Signed-off-by: jyong2.kim <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/1659
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/resource-manipulation/src/resourceCache/include/CacheTypes.h b/service/resource-manipulation/src/resourceCache/include/CacheTypes.h
index 8cf9c41..f5cc29e 100755 (executable)
--- a/service/resource-manipulation/src/resourceCache/include/CacheTypes.h
+++ b/service/resource-manipulation/src/resourceCache/include/CacheTypes.h
@@ -39,8 +39,8 @@ namespace OIC
         class DataCache;
 
         #define CACHE_TAG  PCF("CACHE")
-        #define DEFAULT_REPORT_TIME 10l
-        #define DEFAULT_EXPIRED_TIME 15l
+        #define CACHE_DEFAULT_REPORT_MILLITIME 10000
+        #define CACHE_DEFAULT_EXPIRED_MILLITIME 15000
 
         enum class REPORT_FREQUENCY
         {

diff --git a/service/resource-manipulation/src/resourceCache/src/DataCache.cpp b/service/resource-manipulation/src/resourceCache/src/DataCache.cpp
index eb68466..b48c4b5 100755 (executable)
--- a/service/resource-manipulation/src/resourceCache/src/DataCache.cpp
+++ b/service/resource-manipulation/src/resourceCache/src/DataCache.cpp
@@ -25,8 +25,6 @@
 #include <utility>
 #include <ctime>
 
-//#include "OCApi.h"
-
 #include "DataCache.h"
 
 #include "ResponseStatement.h"
@@ -76,7 +74,7 @@ namespace OIC
             {
                 sResource->requestObserve(pObserveCB);
             }
-            networkTimeOutHandle = networkTimer.postTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+            networkTimeOutHandle = networkTimer.postTimer(CACHE_DEFAULT_EXPIRED_MILLITIME, pTimerCB);
         }
 
         CacheID DataCache::addSubscriber(CacheCB func, REPORT_FREQUENCY rf, long repeatTime)
@@ -90,7 +88,8 @@ namespace OIC
 
             if(subscriberList != nullptr)
             {
-                subscriberList->insert(std::make_pair(newItem.reportID, std::make_pair(newItem, func)));
+                subscriberList->insert(
+                        std::make_pair(newItem.reportID, std::make_pair(newItem, func)));
             }
 
             return newItem.reportID;
@@ -157,7 +156,7 @@ namespace OIC
             }
 
             networkTimer.cancelTimer(networkTimeOutHandle);
-            networkTimeOutHandle = networkTimer.postTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+            networkTimeOutHandle = networkTimer.postTimer(CACHE_DEFAULT_EXPIRED_MILLITIME, pTimerCB);
 
             notifyObservers(_rep.getAttributes());
         }
@@ -178,9 +177,10 @@ namespace OIC
             if(!sResource->isObservable())
             {
                 networkTimer.cancelTimer(networkTimeOutHandle);
-                networkTimeOutHandle = networkTimer.postTimer(DEFAULT_EXPIRED_TIME, pTimerCB);
+                networkTimeOutHandle = networkTimer.postTimer(
+                        CACHE_DEFAULT_EXPIRED_MILLITIME, pTimerCB);
 
-                pollingHandle = pollingTimer.postTimer(DEFAULT_REPORT_TIME, pPollingCB);
+                pollingHandle = pollingTimer.postTimer(CACHE_DEFAULT_REPORT_MILLITIME, pPollingCB);
             }
 
             notifyObservers(_rep.getAttributes());

diff --git a/service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp b/service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp
index a006909..706a2a1 100755 (executable)
--- a/service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp
+++ b/service/resource-manipulation/src/resourceCache/src/ResourceCacheManager.cpp
@@ -71,7 +71,7 @@ namespace OIC
                 if(!reportTime)
                 {
                     // default setting
-                    reportTime = DEFAULT_REPORT_TIME;
+                    reportTime = CACHE_DEFAULT_REPORT_MILLITIME;
                 }
             }