Update snapshot(2018-01-24)

[platform/upstream/iotivity.git] / resource / csdk / stack / src / ocobserve.c

diff --git a/resource/csdk/stack/src/ocobserve.c b/resource/csdk/stack/src/ocobserve.c
index 4fa079b..9fde469 100644 (file)
--- a/resource/csdk/stack/src/ocobserve.c
+++ b/resource/csdk/stack/src/ocobserve.c
@@ -598,8 +598,10 @@ ResourceObserver* GetObserverUsingId (const OCObservationId observeId)
         {
             if (out->observeId == observeId)
             {
+                OIC_LOG(INFO, TAG, "Found in observer list");
+                ResourceObserver *observer = CloneObserverNode(out);
                 oc_mutex_unlock(g_serverObsListMutex);
-                return CloneObserverNode(out);
+                return observer;
             }
             CheckTimedOutObserver(out);
         }
@@ -872,16 +874,16 @@ GetObserveHeaderOption (uint32_t * observationOption,
     return OC_STACK_OK;
 }
 
-OCStackResult InitializeObseverList()
+OCStackResult InitializeObserverList()
 {
-    OIC_LOG(DEBUG, TAG, "InitializeObseverList IN");
+    OIC_LOG(DEBUG, TAG, "InitializeObserverList IN");
 
     if (NULL == g_serverObsListMutex)
     {
         g_serverObsListMutex = oc_mutex_new();
     }
 
-    OIC_LOG(DEBUG, TAG, "InitializeObseverList OUT");
+    OIC_LOG(DEBUG, TAG, "InitializeObserverList OUT");
     return OC_STACK_OK;
 }
 
@@ -889,8 +891,6 @@ void TerminateObserverList()
 {
     OIC_LOG(DEBUG, TAG, "TerminateObserverList IN");
 
-    DeleteObserverList();
-
     if (NULL != g_serverObsListMutex)
     {
         oc_mutex_free(g_serverObsListMutex);