Use injectable network multiplexer holder in SessionCache to bridge generations

2 files changed, 6 insertions, 10 deletions

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 0a2a69368ac..252952e058c 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/NetworkMultiplexer.java
@@ -25,7 +25,7 @@ import java.util.logging.Logger;
  *
  * @author jonmv
  */
-public class NetworkMultiplexer extends AbstractComponent implements NetworkOwner {
+public class NetworkMultiplexer implements NetworkOwner {
 
     private static final Logger log = Logger.getLogger(NetworkMultiplexer.class.getName());
 
@@ -114,14 +114,13 @@ public class NetworkMultiplexer extends AbstractComponent implements NetworkOwne
             net.shutdown();
     }
 
-    @Override
-    public void deconstruct() {
+    public void destroy() {
         if ( ! shared)
-            throw new UnsupportedOperationException("Deconstruct called on a dedicated multiplexer; " +
-                                                    "this shuts down when detached from");
+            throw new UnsupportedOperationException("Destroy called on a dedicated multiplexer; " +
+                                                    "this automatically shuts down when detached from");
 
         if ( ! owners.isEmpty())
-            log.warning("NetworkMultiplexer shut down before all owners detached: " + this);
+            log.warning("NetworkMultiplexer destroyed before all owners detached: " + this);
 
         net.shutdown();
     }
diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java b/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java
index 81b6e4cac27..808a0e95585 100644
--- a/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java
+++ b/messagebus/src/test/java/com/yahoo/messagebus/network/NetworkMultiplexerTest.java
@@ -9,16 +9,13 @@ import com.yahoo.messagebus.test.SimpleMessage;
 import com.yahoo.messagebus.test.SimpleProtocol;
 import com.yahoo.text.Utf8Array;
 import com.yahoo.text.Utf8String;
-import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Queue;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -81,7 +78,7 @@ public class NetworkMultiplexerTest {
         shared.detach(owner2);
         assertFalse(net.shutDown.get());
 
-        shared.deconstruct();
+        shared.destroy();
         assertTrue(net.shutDown.get());
     }