From: Vitalii Irkha <v.irkha@samsung.com>
Date: Thu, 30 Jan 2020 12:51:24 +0000 (+0200)
Subject: OCRemoveDeviceWithUuid waste time
X-Git-Tag: submit/tizen/20210628.055145~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fb1f20909e9df80db32b91fa77b5f0f69631b75a;p=platform%2Fupstream%2Fiotivity.git

OCRemoveDeviceWithUuid waste time

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>
---

diff --git a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c
index 7453a8238..7a3c40e76 100644
--- a/resource/csdk/security/provisioning/src/ocprovisioningmanager.c
+++ b/resource/csdk/security/provisioning/src/ocprovisioningmanager.c
@@ -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)