Fix rebase conflict

project-chip · Jun 17, 2022 · 35a3ca9 · 35a3ca9
1 parent 4355c03
commit 35a3ca9
Showing 1 changed file with 1 addition and 15 deletions.
diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
@@ -392,21 +392,7 @@ void SessionManager::ReleaseSessionsForFabricExceptOne(FabricIndex fabricIndex,
     mSecureSessions.ForEachSession([&](auto session) {
         if (session->GetPeer().GetFabricIndex() == fabricIndex)
         {
-            if (session == exception->AsSecureSession())
-                session->MarkForInactive();
-            else
-                session->MarkForRemoval();
-        }
-        return Loop::Continue;
-    });
-}
-
-void SessionManager::ReleaseSessionForNodeExceptOne(const ScopedNodeId & node, const SessionHandle & exception)
-{
-    mSecureSessions.ForEachSession([&](auto session) {
-        if (session->GetPeer() == node)
-        {
-            if (session == exception->AsSecureSession())
+            if (session == deferred->AsSecureSession())
                 session->MarkForInactive();
             else
                 session->MarkForRemoval();