Use atomic and synchronized sections to do proper accounting of replies. And some geenral code health.

3 files changed, 8 insertions, 4 deletions

diff --git a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
index 0f0b704bba7..393cf420ae1 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/MessageBus.java
@@ -7,7 +7,12 @@ import com.yahoo.log.LogLevel;
 import com.yahoo.messagebus.metrics.MessageBusMetricSet;
 import com.yahoo.messagebus.network.Network;
 import com.yahoo.messagebus.network.NetworkOwner;
-import com.yahoo.messagebus.routing.*;
+import com.yahoo.messagebus.routing.Resender;
+import com.yahoo.messagebus.routing.RetryPolicy;
+import com.yahoo.messagebus.routing.RoutingPolicy;
+import com.yahoo.messagebus.routing.RoutingSpec;
+import com.yahoo.messagebus.routing.RoutingTable;
+import com.yahoo.messagebus.routing.RoutingTableSpec;
 import com.yahoo.text.Utf8Array;
 import com.yahoo.text.Utf8String;
 
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
index ab741b36a05..fdd72c12532 100644
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java
@@ -17,7 +17,6 @@ import com.yahoo.jrt.Transport;
 import com.yahoo.jrt.slobrok.api.IMirror;
 import com.yahoo.jrt.slobrok.api.Mirror;
 import com.yahoo.jrt.slobrok.api.Register;
-import com.yahoo.log.LogLevel;
 import com.yahoo.messagebus.EmptyReply;
 import com.yahoo.messagebus.Error;
 import com.yahoo.messagebus.ErrorCode;
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendAdapter.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendAdapter.java
index dbdb6da6477..749ba4f4451 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendAdapter.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCSendAdapter.java
@@ -17,7 +17,7 @@ public interface RPCSendAdapter {
      *
      * @param net The network to attach to.
      */
-    public void attach(RPCNetwork net);
+    void attach(RPCNetwork net);
 
     /**
      * Performs the actual sending to the given recipient.
@@ -27,5 +27,5 @@ public interface RPCSendAdapter {
      * @param payload       The already serialized payload of the message to send.
      * @param timeRemaining The time remaining until the message expires.
      */
-    public void send(RoutingNode recipient, Version version, byte[] payload, long timeRemaining);
+    void send(RoutingNode recipient, Version version, byte[] payload, long timeRemaining);
 }