[binding] Fix missing callback when notifying a connecting device (#1…

…6553)
project-chip · Mar 24, 2022 · be4abbe · be4abbe
1 parent dad6375
commit be4abbe
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/src/app/clusters/bindings/BindingManager.cpp b/src/app/clusters/bindings/BindingManager.cpp
@@ -188,6 +188,7 @@ void BindingManager::FabricRemoved(CompressedFabricId compressedFabricId, Fabric
 CHIP_ERROR BindingManager::NotifyBoundClusterChanged(EndpointId endpoint, ClusterId cluster, void * context)
 {
     VerifyOrReturnError(mInitParams.mFabricTable != nullptr, CHIP_ERROR_INCORRECT_STATE);
+    VerifyOrReturnError(mBoundDeviceChangedHandler, CHIP_NO_ERROR);
 
     for (auto iter = BindingTable::GetInstance().begin(); iter != BindingTable::GetInstance().end(); ++iter)
     {
@@ -199,18 +200,15 @@ CHIP_ERROR BindingManager::NotifyBoundClusterChanged(EndpointId endpoint, Cluste
                 VerifyOrReturnError(fabricInfo != nullptr, CHIP_ERROR_NOT_FOUND);
                 PeerId peer                         = fabricInfo->GetPeerIdForNode(iter->nodeId);
                 OperationalDeviceProxy * peerDevice = mInitParams.mCASESessionManager->FindExistingSession(peer);
-                if (peerDevice != nullptr && peerDevice->IsConnected() && mBoundDeviceChangedHandler)
+                if (peerDevice != nullptr && peerDevice->IsConnected())
                 {
                     // We already have an active connection
                     mBoundDeviceChangedHandler(*iter, peerDevice, context);
                 }
                 else
                 {
                     mPendingNotificationMap.AddPendingNotification(iter.GetIndex(), context);
-                    if (peerDevice == nullptr || !peerDevice->IsConnecting())
-                    {
-                        ReturnErrorOnFailure(EstablishConnection(iter->fabricIndex, iter->nodeId));
-                    }
+                    ReturnErrorOnFailure(EstablishConnection(iter->fabricIndex, iter->nodeId));
                 }
             }
             else if (iter->type == EMBER_MULTICAST_BINDING)