From e1094108c92f4c2c383976b1afd3046260ff579e Mon Sep 17 00:00:00 2001
From: Zang MingJie <mingjiez@google.com>
Date: Wed, 15 Jun 2022 00:32:18 +0800
Subject: [PATCH] Fix rebase conflict

---
 src/transport/SessionManager.cpp | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp
index 8c90fccf145ee4..1a6e7939c5b702 100644
--- 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();