[controller] change the way of releasing device

project-chip · Feb 17, 2021 · 8976740 · 8976740
1 parent cab273e
commit 8976740
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/controller/CHIPDeviceController_deprecated.cpp b/src/controller/CHIPDeviceController_deprecated.cpp
@@ -176,7 +176,8 @@ bool ChipDeviceController::GetIpAddress(Inet::IPAddress & addr)
     if (!IsConnected())
         return false;
 
-    InitDevice();
+    if (mDevice == nullptr)
+        InitDevice();
 
     return mDevice != nullptr && mDevice->GetIpAddress(addr);
 }
@@ -186,6 +187,7 @@ CHIP_ERROR ChipDeviceController::DisconnectDevice()
     if (mDevice != nullptr)
     {
         mCommissioner.ReleaseDevice(mDevice);
+        mDevice = nullptr;
     }
 
     return CHIP_NO_ERROR;
@@ -205,7 +207,10 @@ CHIP_ERROR ChipDeviceController::SendMessage(void * appReqState, PacketBufferHan
     }
     VerifyOrExit(mRemoteDeviceId != kUndefinedNodeId, err = CHIP_ERROR_INCORRECT_STATE);
 
-    SuccessOrExit(InitDevice());
+    if (mDevice == nullptr)
+    {
+        SuccessOrExit(InitDevice());
+    }
 
     VerifyOrExit(mDevice != nullptr, err = CHIP_ERROR_INVALID_ARGUMENT);
     mDevice->SetDelegate(this);