\r
NSResult NSProviderDeleteCacheData(NSCacheType type, void * data)\r
{\r
- if (data == NULL)\r
+ if (!data)\r
{\r
- return NS_OK;\r
+ return NS_ERROR;\r
}\r
\r
if (type == NS_PROVIDER_CACHE_SUBSCRIBER)\r
\r
(subData->id)[0] = '\0';\r
OICFree(subData);\r
-\r
return NS_OK;\r
}\r
else if(type == NS_PROVIDER_CACHE_REGISTER_TOPIC)\r
(int)topicData->state);\r
\r
OICFree(topicData->topicName);\r
-\r
- NS_LOG_V(DEBUG, "topicData->topicName = %s, topicData->state = %d", "aaa",\r
- (int)3);\r
}\r
else if(type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_NAME ||\r
type == NS_PROVIDER_CACHE_CONSUMER_TOPIC_CID)\r
return topics;\r
}\r
\r
-NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * conTopicList, char *consumerId)\r
+NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,\r
+ NSCacheList * conTopicList, char *consumerId)\r
{\r
- NS_LOG(DEBUG, "NSProviderGetConsumerTopics - IN");\r
+ NS_LOG(DEBUG, "NSProviderGetConsumerTopicsCacheData - IN");\r
\r
pthread_mutex_lock(&NSCacheMutex);\r
- NSTopicLL * topics = NSProviderGetTopics();\r
+ NSTopicLL * topics = NSProviderGetTopicsCacheData(regTopicList);\r
\r
if(!topics)\r
{\r
{\r
NSCacheTopicSubData * curr = (NSCacheTopicSubData *)iter->data;\r
\r
+ NS_LOG_V(DEBUG, "curr->id = %s", curr->id);\r
+ NS_LOG_V(DEBUG, "curr->topicName = %s", curr->topicName);\r
+\r
if(curr && strcmp(curr->id, consumerId) == 0)\r
{\r
NSTopicLL * topicIter = topics;\r
\r
NSTopicLL * NSProviderGetTopicsCacheData(NSCacheList * regTopicList);\r
\r
-NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * conTopicList, char *consumerId);\r
+NSTopicLL * NSProviderGetConsumerTopicsCacheData(NSCacheList * regTopicList,\r
+ NSCacheList * conTopicList, char *consumerId);\r
\r
size_t NSProviderGetListSize(NSCacheElement * firstElement);\r
\r
else\r
{\r
NS_LOG(DEBUG, "Send subscribed topic list to consumer");\r
- topics = NSProviderGetConsumerTopicsCacheData(consumerTopicList, id);\r
+ topics = NSProviderGetConsumerTopicsCacheData(registeredTopicList, consumerTopicList, id);\r
currList = consumerTopicList->head;\r
}\r
\r