2 files changed, 6 insertions, 4 deletions
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 811d8a25459..b4fa7d8f887 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
@@ -32,6 +32,7 @@ import com.yahoo.messagebus.routing.RoutingNode;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.time.Duration;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -240,7 +241,7 @@ public class RPCNetwork implements Network, MethodHandler {
     @Override
     public void send(Message msg, List<RoutingNode> recipients) {
         SendContext ctx = new SendContext(this, msg, recipients);
-        double timeout = ctx.msg.getTimeRemainingNow() / 1000.0;
+        Duration timeout = Duration.ofMillis(ctx.msg.getTimeRemainingNow());
         for (RoutingNode recipient : ctx.recipients) {
             RPCServiceAddress address = (RPCServiceAddress)recipient.getServiceAddress();
             address.getTarget().resolveVersion(timeout, ctx);
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java
index 85f50051e34..6fbab1a4b7f 100755
--- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java
+++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCTarget.java
@@ -7,6 +7,8 @@ import com.yahoo.jrt.RequestWaiter;
 import com.yahoo.jrt.Spec;
 import com.yahoo.jrt.Supervisor;
 import com.yahoo.jrt.Target;
+
+import java.time.Duration;
 import java.util.logging.Level;
 import com.yahoo.text.Utf8Array;
 
@@ -95,7 +97,7 @@ public class RPCTarget implements RequestWaiter {
      * @param timeout The timeout for the request in seconds.
      * @param handler The handler to be called once the version is available.
      */
-    void resolveVersion(double timeout, VersionHandler handler) {
+    void resolveVersion(Duration timeout, VersionHandler handler) {
         boolean hasVersion = false;
         boolean shouldInvoke = false;
         boolean shouldLog = log.isLoggable(Level.FINE);
@@ -158,8 +160,7 @@ public class RPCTarget implements RequestWaiter {
     /**
      * <p>Declares a version handler used when resolving the version of a
      * target. An instance of this is passed to {@link
-     * RPCTarget#resolveVersion(double,
-     * com.yahoo.messagebus.network.rpc.RPCTarget.VersionHandler)}, and invoked
+     * RPCTarget#resolveVersion(Duration, RPCTarget.VersionHandler)}, and invoked
      * either synchronously or asynchronously, depending on whether or not the
      * version is already available.</p>
      */