Info log message when MbusServer is finally destroyed

2 files changed, 4 insertions, 2 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
index cbaeb25af58..7e8286d8793 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/IntermediateSession.java
@@ -119,6 +119,7 @@ public final class IntermediateSession implements MessageHandler, ReplyHandler,
         mbus.connect(name, broadcastName);
     }
 
-    @Override public void disconnect() { close(); }
+    @Override
+    public void disconnect() { close(); }
 
 }
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java b/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java
index 0759a5661be..85389c8b21f 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java
@@ -6,6 +6,7 @@ import com.yahoo.messagebus.Protocol;
 import com.yahoo.text.Utf8Array;
 
 import java.util.Deque;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedDeque;
@@ -68,7 +69,7 @@ public class NetworkMultiplexer implements NetworkOwner {
 
     public void unregisterSession(String session, NetworkOwner owner, boolean broadcast) {
         sessions.computeIfPresent(session, (name, owners) -> {
-            if (owners.size() == 1 && owners.contains(owner)) {
+            if (owners.equals(List.of(owner))) {
                 if (broadcast)
                     net.unregisterSession(session);
                 return null;