Let server session.connect() conncet to net, and use newest destination

No practical changes, but less API misuse. @bjorncs please review.

5 files changed, 11 insertions, 12 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 a2131f22dc4..67badddddd2 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
@@ -43,6 +43,7 @@ public final class MbusServer extends AbstractResource implements ServerProvider
     @Override
     public void start() {
         log.log(Level.FINE, "Starting message bus server.");
+        session.connect();
         running.set(true);
     }
 
@@ -50,7 +51,6 @@ public final class MbusServer extends AbstractResource implements ServerProvider
     public void close() {
         log.log(Level.FINE, "Closing message bus server.");
         running.set(false);
-        session.close();
     }
 
     @Override
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/ServerSession.java b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/ServerSession.java
index 4cd4a776292..9bab25ae87d 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/ServerSession.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/ServerSession.java
@@ -2,13 +2,14 @@
 package com.yahoo.messagebus.shared;
 
 import com.yahoo.jdisc.SharedResource;
+import com.yahoo.messagebus.Connectable;
 import com.yahoo.messagebus.MessageHandler;
 import com.yahoo.messagebus.Reply;
 
 /**
  * @author Simon Thoresen Hult
  */
-public interface ServerSession extends SharedResource {
+public interface ServerSession extends SharedResource, Connectable {
 
     MessageHandler getMessageHandler();
 
@@ -20,6 +21,4 @@ public interface ServerSession extends SharedResource {
 
     String name();
 
-    void close();
-
 }
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java
index 5a9cd39c5b4..7a39005cd48 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedDestinationSession.java
@@ -28,7 +28,7 @@ public class SharedDestinationSession extends AbstractResource implements Messag
 
     SharedDestinationSession(SharedMessageBus mbus, DestinationSessionParams params) {
         this.msgHandler.set(params.getMessageHandler());
-        this.session = mbus.messageBus().createDestinationSession(params.setMessageHandler(this));
+        this.session = mbus.messageBus().createDetachedDestinationSession(params.setMessageHandler(this));
         this.mbusReference = mbus.refer();
     }
 
@@ -77,8 +77,8 @@ public class SharedDestinationSession extends AbstractResource implements Messag
     }
 
     @Override
-    public void close() {
-        session.destroy();
+    public void connect() {
+        session.connect();
     }
 
     @Override
diff --git a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedIntermediateSession.java b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedIntermediateSession.java
index 64cc1aaf510..cb35a0a42f1 100644
--- a/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedIntermediateSession.java
+++ b/container-messagebus/src/main/java/com/yahoo/messagebus/shared/SharedIntermediateSession.java
@@ -35,8 +35,8 @@ public class SharedIntermediateSession extends AbstractResource
             throw new IllegalArgumentException("Reply handler must be null.");
         }
         this.msgHandler.set(params.getMessageHandler());
-        this.session = mbus.messageBus().createIntermediateSession(params.setReplyHandler(this)
-                                                                         .setMessageHandler(this));
+        this.session = mbus.messageBus().createDetachedIntermediateSession(params.setReplyHandler(this)
+                                                                                 .setMessageHandler(this));
         this.mbusReference = mbus.refer();
     }
 
@@ -96,8 +96,8 @@ public class SharedIntermediateSession extends AbstractResource
     }
 
     @Override
-    public void close() {
-        session.destroy();
+    public void connect() {
+        session.connect();
     }
 
     @Override
diff --git a/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java b/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java
index 6ebb41c4ab7..a251cddcbdf 100644
--- a/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java
+++ b/container-messagebus/src/test/java/com/yahoo/messagebus/jdisc/MbusServerTestCase.java
@@ -352,7 +352,7 @@ public class MbusServerTestCase {
         }
 
         @Override
-        public void close() { }
+        public void connect() { }
 
         @Override
         public ResourceReference refer() {