OCRemoveDeviceWithUuid waste time 36/236736/1
authorVitalii Irkha <v.irkha@samsung.com>
Thu, 30 Jan 2020 12:51:24 +0000 (14:51 +0200)
committerSudipto <sudipto.bal@samsung.com>
Fri, 19 Jun 2020 17:19:57 +0000 (22:49 +0530)
Fix waste time by OCRemoveDeviceWithUuid() API,
in cases if callback was not called.

https://github.sec.samsung.net/RS7-IOTIVITY/IoTivity/pull/658
(cherry-picked from bc40a08891e7ebcd790027bea58822b93c7128c8)

Change-Id: I11756b658c0eace489a990b588f085417494c6b9
Signed-off-by: Vitalii Irkha <v.irkha@samsung.com>
Signed-off-by: Sudipto <sudipto.bal@samsung.com>
resource/csdk/security/provisioning/src/ocprovisioningmanager.c

index 7453a82..7a3c40e 100644 (file)
@@ -843,11 +843,14 @@ OCStackResult OCRemoveDeviceWithUuid(void* ctx, unsigned short waitTimeForOwnedD
     int maxWait = MAX_WAIT_TIME;
     g_reset = 1;
 
-    SRPResetDevice(pTargetDev, localResultCallback);
-    while(g_reset && maxWait)
+    res = SRPResetDevice(pTargetDev, localResultCallback);
+    if(OC_STACK_OK == res)
     {
-        sleep(1);
-        maxWait--;
+        while(g_reset && maxWait)
+        {
+            sleep(1);
+            maxWait--;
+        }
     }
 
     if(OC_STACK_CONTINUE == resReq)