A collection of code cleanup in messagebus. And a bonus of catching missing shutdown of config subscription.

2 files changed, 8 insertions, 6 deletions

diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java
index 752be1bdde7..fd377aaa7d1 100644
--- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java
+++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java
@@ -4,8 +4,14 @@ package com.yahoo.messagebus.shared;
 import com.yahoo.jdisc.AbstractResource;
 import com.yahoo.jdisc.ResourceReference;
 import com.yahoo.log.LogLevel;
-import com.yahoo.messagebus.*;
+import com.yahoo.messagebus.DestinationSession;
+import com.yahoo.messagebus.DestinationSessionParams;
+import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Error;
+import com.yahoo.messagebus.ErrorCode;
+import com.yahoo.messagebus.Message;
+import com.yahoo.messagebus.MessageHandler;
+import com.yahoo.messagebus.Reply;
 
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Logger;
@@ -17,12 +23,10 @@ public class SharedDestinationSession extends AbstractResource implements Messag
 
     private static final Logger log = Logger.getLogger(SharedDestinationSession.class.getName());
     private final AtomicReference<MessageHandler> msgHandler = new AtomicReference<>();
-    private final SharedMessageBus mbus;
     private final DestinationSession session;
     private final ResourceReference mbusReference;
 
-    public SharedDestinationSession(SharedMessageBus mbus, DestinationSessionParams params) {
-        this.mbus = mbus;
+    SharedDestinationSession(SharedMessageBus mbus, DestinationSessionParams params) {
         this.msgHandler.set(params.getMessageHandler());
         this.session = mbus.messageBus().createDestinationSession(params.setMessageHandler(this));
         this.mbusReference = mbus.refer();
diff --git a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java
index 6fed667992c..d49a5ea67b8 100644
--- a/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java
+++ b/jdisc_messagebus_service/src/main/java/com/yahoo/messagebus/shared/SharedSourceSession.java
@@ -19,7 +19,6 @@ import java.util.logging.Logger;
 public class SharedSourceSession extends AbstractResource implements ClientSession, ReplyHandler {
 
     private static final Logger log = Logger.getLogger(SharedSourceSession.class.getName());
-    private final SharedMessageBus mbus;
     private final SourceSession session;
     private final ResourceReference mbusReference;
 
@@ -27,7 +26,6 @@ public class SharedSourceSession extends AbstractResource implements ClientSessi
         if (params.getReplyHandler() != null) {
             throw new IllegalArgumentException("Reply handler must be null.");
         }
-        this.mbus = mbus;
         this.session = mbus.messageBus().createSourceSession(params.setReplyHandler(this));
         this.mbusReference = mbus.refer();
     }