Ensure mbus is not shut down while processing mbus requests

2 files changed, 11 insertions, 15 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index 4a443a9fde5..b4e57876bc2 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -267,10 +267,10 @@ public class MessageBus implements ConfigHandler, NetworkOwner, MessageHandler,
      * values for the {@link IntermediateSessionParams} object.</p>
      *
      * @param name          The local unique name for the created session.
-     * @param broadcastName Whether or not to broadcast this session's name on
+     * @param broadcastName Whether to broadcast this session's name on
      *                      the network.
      * @param msgHandler    The handler to receive the messages for the session.
-     * @param replyHandler  The handler to received the replies for the session.
+     * @param replyHandler  The handler to receive the replies for the session.
      * @return The created session.
      */
     public IntermediateSession createIntermediateSession(String name,
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/local/LocalNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/local/LocalNetwork.java
index 44f29df0e91..beef238288a 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/local/LocalNetwork.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/local/LocalNetwork.java
@@ -87,19 +87,15 @@ public class LocalNetwork implements Network {
 
     private void receiveLater(MessageEnvelope envelope) {
         byte[] payload = envelope.sender.encode(envelope.msg.getProtocol(), envelope.msg);
-        executor.execute(new Runnable() {
-
-            @Override
-            public void run() {
-                Message msg = decode(envelope.msg.getProtocol(), payload, Message.class);
-                msg.getTrace().setLevel(envelope.msg.getTrace().getLevel());
-                msg.setRoute(envelope.msg.getRoute()).getRoute().removeHop(0);
-                msg.setRetryEnabled(envelope.msg.getRetryEnabled());
-                msg.setRetry(envelope.msg.getRetry());
-                msg.setTimeRemaining(envelope.msg.getTimeRemainingNow());
-                msg.pushHandler(reply -> new ReplyEnvelope(LocalNetwork.this, envelope, reply).send());
-                owner.deliverMessage(msg, ((LocalServiceAddress) envelope.recipient.getServiceAddress()).getSessionName());
-            }
+        executor.execute(() -> {
+            Message msg = decode(envelope.msg.getProtocol(), payload, Message.class);
+            msg.getTrace().setLevel(envelope.msg.getTrace().getLevel());
+            msg.setRoute(envelope.msg.getRoute()).getRoute().removeHop(0);
+            msg.setRetryEnabled(envelope.msg.getRetryEnabled());
+            msg.setRetry(envelope.msg.getRetry());
+            msg.setTimeRemaining(envelope.msg.getTimeRemainingNow());
+            msg.pushHandler(reply -> new ReplyEnvelope(LocalNetwork.this, envelope, reply).send());
+            owner.deliverMessage(msg, ((LocalServiceAddress) envelope.recipient.getServiceAddress()).getSessionName());
         });
     }