Bug fixes for initialize condition of TopicList.

Remove initialize condition variable for topiclist.
not required that variable.

Change-Id: Ia63540bbff0998729797e51019f5a288f9702641
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10475
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/src/provider/NSProviderMemoryCache.c b/service/notification/src/provider/NSProviderMemoryCache.c
index 8e4b4d9..e8583d9 100644 (file)
--- a/service/notification/src/provider/NSProviderMemoryCache.c
+++ b/service/notification/src/provider/NSProviderMemoryCache.c
@@ -256,21 +256,17 @@ NSResult NSStorageDestroy(NSCacheList * list)
 {\r
     NSCacheElement * iter = list->head;\r
     NSCacheElement * next = NULL;\r
-\r
     NSCacheType type = list->cacheType;\r
 \r
     while (iter)\r
     {\r
         next = (NSCacheElement *) iter->next;\r
-\r
         NSProviderDeleteCacheData(type, iter->data);\r
         OICFree(iter);\r
-\r
         iter = next;\r
     }\r
 \r
     OICFree(list);\r
-\r
     return NS_OK;\r
 }\r
 \r
@@ -372,7 +368,8 @@ NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)
         NSCacheTopicData * data = (NSCacheTopicData *) data;\r
         OICFree(data->topicName);\r
     }\r
-    else if(type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME || NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID)\r
+    else if(type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME ||\r
+            type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID)\r
     {\r
         NSCacheTopicSubData * data = (NSCacheTopicSubData *) data;\r
         OICFree(data->topicName);\r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 93577d8..6fffb99 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -20,29 +20,17 @@
 \r
 #include "NSProviderTopic.h"\r
 \r
-static bool isTopicList = false;\r
-\r
-NSResult NSStoreTopics(const char * topicName);\r
 NSResult NSSendTopicUpdation();\r
 \r
 NSResult NSInitTopicList()\r
 {\r
     NS_LOG(DEBUG, "NSInitTopicList - IN");\r
-\r
-    if(isTopicList)\r
-    {\r
-        NS_LOG(DEBUG, "topic list has already initiated");\r
-        return NS_FAIL;\r
-    }\r
-\r
     consumerTopicList = NSStorageCreate();\r
     consumerTopicList->cacheType = NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME;\r
 \r
     registeredTopicList = NSStorageCreate();\r
     registeredTopicList->cacheType = NS_PROVIDER_CACHE_REGISTER_TOPIC;\r
 \r
-    isTopicList = true;\r
-\r
     NS_LOG(DEBUG, "NSInitTopicList - OUT");\r
     return NS_OK;\r
 }\r
@@ -102,7 +90,6 @@ NSResult NSDeleteTopics(const char * topicName)
 \r
     NSStorageDelete(registeredTopicList, topicName);\r
     while(NSStorageDelete(consumerTopicList, topicName) != NS_FAIL);\r
-\r
     return NS_OK;\r
 }\r
 \r

diff --git a/service/notification/unittest/NSProviderTest.cpp b/service/notification/unittest/NSProviderTest.cpp
index ce86a03..7b3eeef 100755 (executable)
--- a/service/notification/unittest/NSProviderTest.cpp
+++ b/service/notification/unittest/NSProviderTest.cpp
@@ -136,6 +136,7 @@ TEST_F(NotificationProviderTest, StartProviderPositiveWithNSPolicyTrue)
     config.subRequestCallback = NSRequestedSubscribeCallbackEmpty;
     config.syncInfoCallback = NSSyncCallbackEmpty;
     config.policy = true;
+    config.userInfo = NULL;
 
     NSResult ret = NSStartProvider(config);
 
@@ -161,6 +162,7 @@ TEST_F(NotificationProviderTest, StartProviderPositiveWithNSPolicyFalse)
     config.subRequestCallback = NSRequestedSubscribeCallbackEmpty;
     config.syncInfoCallback = NSSyncCallbackEmpty;
     config.policy = false;
+    config.userInfo = NULL;
 
     NSResult ret = NSStartProvider(config);
 
@@ -188,6 +190,7 @@ TEST_F(NotificationProviderTest, ExpectCallbackWhenReceiveSubscribeRequestWithAc
     config.subRequestCallback = NSRequestedSubscribeCallbackEmpty;
     config.syncInfoCallback = NSSyncCallbackEmpty;
     config.policy = true;
+    config.userInfo = NULL;
 
     NSStartProvider(config);