Add deallocation memory for related topic.

This patch included,
Add deallocation memory for remaining task.

Change-Id: I344ae1f65eb8385959a832baf9e09454833cc611
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10777
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>

diff --git a/service/notification/src/provider/NSProviderScheduler.c b/service/notification/src/provider/NSProviderScheduler.c
index 75f537a..2fbf554 100755 (executable)
--- a/service/notification/src/provider/NSProviderScheduler.c
+++ b/service/notification/src/provider/NSProviderScheduler.c
@@ -262,6 +262,34 @@ void NSFreeData(NSSchedulerType type, NSTask * task)
                 break;\r
         }\r
     }\r
-\r
+    else if (type == TOPIC_SCHEDULER)\r
+    {\r
+        switch (task->taskType)\r
+        {\r
+            case TASK_SUBSCRIBE_TOPIC:\r
+            case TASK_UNSUBSCRIBE_TOPIC:\r
+            {\r
+                NSCacheTopicSubData * data = task->taskData;\r
+                OICFree(data->topicName);\r
+                OICFree(data);\r
+            }\r
+                break;\r
+            case TASK_ADD_TOPIC:\r
+            case TASK_DELETE_TOPIC:\r
+            {\r
+                OICFree(task->taskData);\r
+            }\r
+                break;\r
+            case TASK_SEND_TOPICS:\r
+            case TASK_POST_TOPIC:\r
+            {\r
+                NS_LOG(DEBUG, "TASK_POST_TOPIC : ");\r
+                NSFreeOCEntityHandlerRequest((OCEntityHandlerRequest*) task->taskData);\r
+            }\r
+                break;\r
+            default:\r
+                break;\r
+        }\r
+    }\r
     NS_LOG(DEBUG, "NSFreeData - OUT");\r
 }\r

diff --git a/service/notification/src/provider/NSProviderTopic.c b/service/notification/src/provider/NSProviderTopic.c
index 30f16b2..a2a3b3f 100644 (file)
--- a/service/notification/src/provider/NSProviderTopic.c
+++ b/service/notification/src/provider/NSProviderTopic.c
@@ -282,7 +282,6 @@ NSResult NSSendTopicList(OCEntityHandlerRequest * entityHandlerRequest)
         return NS_ERROR;\r
     }\r
     OCRepPayloadDestroy(payload);\r
-    NSFreeOCEntityHandlerRequest(entityHandlerRequest);\r
 \r
     NS_LOG(DEBUG, "NSSendTopicList - OUT");\r
     return NS_OK;\r
@@ -359,6 +358,7 @@ void * NSTopicSchedule(void * ptr)
                 case TASK_SEND_TOPICS:\r
                     NS_LOG(DEBUG, "CASE TASK_SEND_TOPICS : ");\r
                     NSSendTopicList((OCEntityHandlerRequest*) node->taskData);\r
+                    NSFreeOCEntityHandlerRequest((OCEntityHandlerRequest*) node->taskData);\r
                     break;\r
                 case TASK_SUBSCRIBE_TOPIC:\r
                     NS_LOG(DEBUG, "CASE TASK_SUBSCRIBE_TOPIC : ");\r
@@ -389,6 +389,7 @@ void * NSTopicSchedule(void * ptr)
                 {\r
                     NS_LOG(DEBUG, "TASK_POST_TOPIC : ");\r
                     NSPostConsumerTopics((OCEntityHandlerRequest*) node->taskData);\r
+                    NSFreeOCEntityHandlerRequest((OCEntityHandlerRequest*) node->taskData);\r
                 }\r
                     break;\r
                 default:\r