diff options
Diffstat (limited to 'container-messagebus/src/main/java/com/yahoo/messagebus/shared')
3 files changed, 9 insertions, 10 deletions
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 |