fix unbind

project-chip · Jan 18, 2022 · d93edf7 · d93edf7
1 parent a9aafb3
commit d93edf7
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/app/clusters/bindings/BindingManager.cpp b/src/app/clusters/bindings/BindingManager.cpp
@@ -118,11 +118,12 @@ CHIP_ERROR BindingManager::LastUnicastBindingRemoved(FabricIndex fabric, NodeId
     VerifyOrReturnError(fabricInfo != nullptr, CHIP_ERROR_NOT_FOUND);
     PeerId peer                      = fabricInfo->GetPeerIdForNode(node);
     PendingNotificationEntry * entry = mPendingNotificationMap.FindEntry(peer);
-
-    VerifyOrReturnError(entry != nullptr, CHIP_ERROR_NOT_FOUND);
+    if (entry)
+    {
+        mPendingNotificationMap.RemoveEntry(entry);
+    }
 
     mAppServer->GetCASESessionManager()->ReleaseSession(peer);
-    mPendingNotificationMap.RemoveEntry(entry);
     return CHIP_NO_ERROR;
 }