X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=service%2Fnotification%2Fsrc%2Fprovider%2FNSProviderCallbackResponse.c;h=e702bab138bb50e45108333439dd4f2796790cc2;hb=3c093548382bb2542c87a67e6e5fa32552c29cb3;hp=d92afd6f97864d99fa411150eb629d366a34b8fd;hpb=f03c8766f8326defb4c65dcc57d61ba004c0db4e;p=platform%2Fupstream%2Fiotivity.git

diff --git a/service/notification/src/provider/NSProviderCallbackResponse.c b/service/notification/src/provider/NSProviderCallbackResponse.c
index d92afd6..e702bab 100644
--- a/service/notification/src/provider/NSProviderCallbackResponse.c
+++ b/service/notification/src/provider/NSProviderCallbackResponse.c
@@ -18,12 +18,11 @@
 //
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-#include "NSProvider.h"
+#include "NSProviderInterface.h"
 #include "NSProviderScheduler.h"
 #include "NSProviderListener.h"
 #include "NSProviderSubscription.h"
 #include "NSProviderNotification.h"
-#include "NSStorageAdapter.h"
 #include "NSProviderMemoryCache.h"
 #include "NSProviderCallbackResponse.h"
 #include "oic_malloc.h"
@@ -44,7 +43,7 @@ void NSRegisterSubscribeRequestCb(NSSubscribeRequestCallback subscribeRequestCb)
     NS_LOG(DEBUG, "NSRegisterSubscribeRequestCb - OUT");
 }
 
-void  NSRegisterSyncCb(NSProviderSyncInfoCallback syncCb)
+void NSRegisterSyncCb(NSProviderSyncInfoCallback syncCb)
 {
     NS_LOG(DEBUG, "NSRegisterSyncCb - IN");
     g_syncCb = syncCb;
@@ -91,15 +90,16 @@ void * NSCallbackResponseSchedule(void * ptr)
                     OCEntityHandlerRequest * request = (OCEntityHandlerRequest*)node->taskData;
                     NSConsumer * consumer = (NSConsumer *)OICMalloc(sizeof(NSConsumer));
 
-                    char * consumerId = NSGetValueFromQuery(OICStrdup(request->query),
-                            NS_QUERY_CONSUMER_ID);
+                    char * copyQuery = OICStrdup(request->query);
+                    char * consumerId = NSGetValueFromQuery(copyQuery, NS_QUERY_CONSUMER_ID);
 
-                    if(consumerId)
+                    if (consumerId)
                     {
                         OICStrcpy(consumer->consumerId, UUID_STRING_SIZE, consumerId);
                         NSSubscribeRequestCb(consumer);
                     }
 
+                    NSOICFree(copyQuery);
                     NSFreeConsumer(consumer);
                     NSFreeOCEntityHandlerRequest(request);
 
@@ -117,7 +117,7 @@ void * NSCallbackResponseSchedule(void * ptr)
                     NS_LOG(DEBUG, "No Task Type");
                     break;
             }
-            OICFree(node);
+            NSOICFree(node);
         }
 
         pthread_mutex_unlock(&NSMutex[CALLBACK_RESPONSE_SCHEDULER]);