Update snapshot(2018-01-10)

[platform/upstream/iotivity.git] / resource / csdk / connectivity / src / bt_le_adapter / tizen / caleserver_mcd.c

diff --git a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c
index 6913289..9aa398b 100644 (file)
--- a/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c
+++ b/resource/csdk/connectivity/src/bt_le_adapter/tizen/caleserver_mcd.c
@@ -678,6 +678,7 @@ CAResult_t CAInitLEGattServer()
         {
             OIC_LOG_V(ERROR, TAG, "bt_gatt_server_create failed with ret[%s]",
                       CALEGetErrorMsg(ret));
+            bt_gatt_server_deinitialize();
             return CA_STATUS_FAILED;
         }
     }
@@ -695,7 +696,8 @@ CAResult_t CADeInitLEGattServer()
     {
         OIC_LOG_V(ERROR, TAG, "bt_gatt_server_unregister_all_services failed with ret[%s]",
                   CALEGetErrorMsg(ret));
-        return CA_STATUS_FAILED;
+        // CONPRO-1181 continue even bt API fails during DeInit
+        //return CA_STATUS_FAILED;
     }
 
     ret = bt_gatt_server_destroy(g_gattServer);
@@ -703,7 +705,8 @@ CAResult_t CADeInitLEGattServer()
     {
         OIC_LOG_V(ERROR, TAG, "bt_gatt_server_destroy failed with ret[%s]",
                   CALEGetErrorMsg(ret));
-        return CA_STATUS_FAILED;
+        // CONPRO-1181 continue even bt API fails during DeInit
+        //return CA_STATUS_FAILED;
     }
     g_gattServer = NULL;
 
@@ -712,7 +715,8 @@ CAResult_t CADeInitLEGattServer()
     {
         OIC_LOG_V(ERROR, TAG, "bt_gatt_server_deinitialize failed with ret[%s]",
                   CALEGetErrorMsg(ret));
-        return CA_STATUS_FAILED;
+        // CONPRO-1181 continue even bt API fails during DeInit
+        //return CA_STATUS_FAILED;
     }
 
     OIC_LOG(DEBUG, TAG, "OUT");