Address review comments.

project-chip · Jan 11, 2022 · d110ac7 · d110ac7
1 parent a4b0aaa
commit d110ac7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/controller/CommissioneeDeviceProxy.cpp b/src/controller/CommissioneeDeviceProxy.cpp
@@ -134,9 +134,17 @@ CHIP_ERROR CommissioneeDeviceProxy::UpdateDeviceData(const Transport::PeerAddres
 
 CHIP_ERROR CommissioneeDeviceProxy::SetConnected()
 {
-    mState = ConnectionState::SecureConnected;
-    bool didLoad;
-    return LoadSecureSessionParametersIfNeeded(didLoad);
+    if (mState != ConnectionState::Connecting)
+    {
+        return CHIP_ERROR_INCORRECT_STATE;
+    }
+    bool _didLoad;
+    CHIP_ERROR err = LoadSecureSessionParametersIfNeeded(_didLoad);
+    if (err == CHIP_NO_ERROR)
+    {
+        mState = ConnectionState::SecureConnected;
+    }
+    return err;
 }
 
 void CommissioneeDeviceProxy::Reset()

diff --git a/src/controller/CommissioneeDeviceProxy.h b/src/controller/CommissioneeDeviceProxy.h
@@ -198,7 +198,7 @@ class CommissioneeDeviceProxy : public DeviceProxy, public SessionReleaseDelegat
 
     /**
      * @brief
-     * Should be called when the pairing completes.
+     * Called to indicate this proxy has been paired successfully.
      *
      * This causes the secure session parameters to be loaded and stores the session details in the session manager.
      */