Info log message when MbusServer is finally destroyed

5 files changed, 8 insertions, 6 deletions

diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java
index 3949d713768..4c21489ded2 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/jdisc/MbusServer.java
@@ -48,8 +48,8 @@ public final class MbusServer extends AbstractResource implements ServerProvider
     @Override
     public void start() {
         log.log(Level.FINE, "Starting message bus server.");
-        session.connect();
         runState.set(State.RUNNING);
+        session.connect();
     }
 
     @Override
@@ -66,7 +66,7 @@ public final class MbusServer extends AbstractResource implements ServerProvider
 
     @Override
     protected void destroy() {
-        log.log(Level.FINE, "Destroying message bus server.");
+        log.log(Level.INFO, "Destroying message bus server: " + session.name());
         runState.set(State.STOPPED);
         sessionReference.close();
     }
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java
index 3556fb0a739..8b0cd62df07 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/FutureConjunction.java
@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
- * <p>This class implements a Future&lt;Boolean&gt; that is conjunction of zero or more other Future&lt;Boolean&gt;s,
+ * <p>This class implements a Future&lt;Boolean&gt; that is a conjunction of zero or more other Future&lt;Boolean&gt;s,
  * i.e. it evaluates to <code>true</code> if, and only if, all its operands evaluate to <code>true</code>. To use this class,
  * simply create an instance of it and add operands to it using the {@link #addOperand(CompletableFuture)} method.</p>
  *
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
index 28037ce6fb4..b60b62e3f86 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/handler/RequestDispatch.java
@@ -119,7 +119,7 @@ public abstract class RequestDispatch implements Future<Response>, ResponseHandl
                     try {
                         return futureResponse.get();
                     } catch (InterruptedException | ExecutionException e) {
-                        throw new IllegalStateException(e); // Should not happens since both futures are complete
+                        throw new IllegalStateException(e); // Should not happen since both futures are complete
                     }
                 });
     }
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;