Fixed wrong log text message. 93/186693/1
authorsaerome.kim <saerome.kim@samsung.com>
Mon, 13 Aug 2018 11:43:58 +0000 (20:43 +0900)
committersaerome.kim <saerome.kim@samsung.com>
Mon, 13 Aug 2018 11:43:58 +0000 (20:43 +0900)
Change-Id: I784664218b01cf76b8e11ad1cd92f9d5964645ea
Signed-off-by: saerome.kim <saerome.kim@samsung.com>
src/mot-agent/ma-subowner.c

index f7ae774bcf6676a27e6bc0d0a010f6b759bef6ae..009a6fe7ef2f1672a439010ccf2b4aa3462e0633 100644 (file)
@@ -1899,14 +1899,14 @@ static void _make_devices_unpair_func(ma_req_cb_s *con)
                goto PV_UNPAIR_END;
        }
 
-       g_client->g_doneCB = false;
-
 #ifdef DEBUG_UUID
        MA_LOGD("owner_dev = %s", ma_get_readable_uuid(owner_uuid));
        MA_LOGD("owned_dev = %s", ma_get_readable_uuid(owned_uuid));
 #endif
 
        MA_LOGI("Unlink Selected Pairwise Devices..");
+       g_client->g_doneCB = false;
+
        g_mutex_lock(&g_client->iotivity_mutex);
        ret = OCUnlinkDevices((void*) g_client, owner_dev, owned_dev, _unlink_resources_cb);
        g_mutex_unlock(&g_client->iotivity_mutex);
@@ -1920,10 +1920,9 @@ static void _make_devices_unpair_func(ma_req_cb_s *con)
                                ret, ma_ocf_error_to_string(ret));
                }
        }
-
-       /* display the pairwise-provisioned result */
        MA_LOGI("Unlink Devices Done");
 
+       MA_LOGI("Start Remove SubOwner..");
        g_client->g_doneCB = false;
 
        ret = GetDoxmDevOwnerId(&uuid_mowner);
@@ -1931,6 +1930,9 @@ static void _make_devices_unpair_func(ma_req_cb_s *con)
                MA_LOGE("GetDoxmDevOwnerId faild = [%d][%s]",
                        ret, ma_ocf_error_to_string(ret));
        }
+#ifdef DEBUG_UUID
+       MA_LOGD("uuid_mowner = %s", ma_get_readable_uuid(&uuid_mowner));
+#endif
 
        g_mutex_lock(&g_client->iotivity_mutex);
        ret = OCRemoveSubOwner(g_client, owned_dev, &uuid_mowner, _remove_subowner_cb);
@@ -1946,12 +1948,11 @@ static void _make_devices_unpair_func(ma_req_cb_s *con)
                        ret, ma_ocf_error_to_string(ret));
        }
 
-       MA_LOGI("Remove Multiple Ownership Done");
+       MA_LOGI("Remove SubOwner Done");
 
+       MA_LOGI("Start Removing CRED for remote device at local SVR DB");
        g_client->g_doneCB = false;
 
-       MA_LOGI(" Removing CRED for remote device at local SVR DB");
-
        g_mutex_lock(&g_client->iotivity_mutex);
        ret = OCRemoveDeviceWithUuid((void*) g_client, CALLBACK_TIMEOUT_5S, owned_uuid,
                _remove_device_cb);
@@ -1968,7 +1969,7 @@ static void _make_devices_unpair_func(ma_req_cb_s *con)
                goto PV_UNPAIR_END;
        }
        /* Disaply result result */
-       MA_LOGI(" Removing CRED info. at local SVR DB - Done");
+       MA_LOGI("Removing CRED info. at local SVR DB Done");
 
 PV_UNPAIR_END:
        /* Notify unpair result  */