dnsjava
diff --git a/‎src/main/java/org/xbill/DNS/TCPClient.java
Lines changed: 18 additions & 14 deletions b/‎src/main/java/org/xbill/DNS/TCPClient.java
Lines changed: 18 additions & 14 deletions
diff --git a/‎src/main/java/org/xbill/DNS/ZoneTransferIn.java
Lines changed: 3 additions & 3 deletions b/‎src/main/java/org/xbill/DNS/ZoneTransferIn.java
Lines changed: 3 additions & 3 deletions
@@ -11,14 +11,17 @@
 import java.nio.channels.SelectionKey;
 import java.nio.channels.Selector;
 import java.nio.channels.SocketChannel;
-import java.util.concurrent.TimeUnit;
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 
 final class TCPClient {
-  private final long endTime;
+  private final long startTime;
+  private final Duration timeout;
   private final SelectionKey key;
 
-  TCPClient(long timeout) throws IOException {
-    endTime = System.nanoTime() + TimeUnit.MILLISECONDS.toNanos(timeout);
+  TCPClient(Duration timeout) throws IOException {
+    this.timeout = timeout;
+    startTime = System.nanoTime();
     boolean done = false;
     Selector selector = null;
     SocketChannel channel = SocketChannel.open();
@@ -51,7 +54,7 @@ void connect(SocketAddress addr) throws IOException {
     try {
       while (!channel.finishConnect()) {
         if (!key.isConnectable()) {
-          blockUntil(key, endTime);
+          blockUntil(key);
         }
       }
     } finally {
@@ -84,11 +87,11 @@ void send(byte[] data) throws IOException {
             throw new EOFException();
           }
           nsent += (int) n;
-          if (nsent < data.length + 2 && endTime - System.nanoTime() < 0) {
+          if (nsent < data.length + 2 && System.nanoTime() - startTime >= timeout.toNanos()) {
             throw new SocketTimeoutException();
           }
         } else {
-          blockUntil(key, endTime);
+          blockUntil(key);
         }
       }
     } finally {
@@ -112,11 +115,11 @@ private byte[] _recv(int length) throws IOException {
             throw new EOFException();
           }
           nrecvd += (int) n;
-          if (nrecvd < length && System.currentTimeMillis() > endTime) {
+          if (nrecvd < length && System.nanoTime() - startTime >= timeout.toNanos()) {
             throw new SocketTimeoutException();
           }
         } else {
-          blockUntil(key, endTime);
+          blockUntil(key);
         }
       }
     } finally {
@@ -127,12 +130,13 @@ private byte[] _recv(int length) throws IOException {
     return data;
   }
 
-  private static void blockUntil(SelectionKey key, long endTime) throws IOException {
-    long timeout = TimeUnit.NANOSECONDS.toMillis(endTime - System.nanoTime());
+  private void blockUntil(SelectionKey key) throws IOException {
+    long remainingTimeout =
+        timeout.minus(System.nanoTime() - startTime, ChronoUnit.NANOS).toMillis();
     int nkeys = 0;
-    if (timeout > 0) {
-      nkeys = key.selector().select(timeout);
-    } else if (timeout == 0) {
+    if (remainingTimeout > 0) {
+      nkeys = key.selector().select(remainingTimeout);
+    } else if (remainingTimeout == 0) {
       nkeys = key.selector().selectNow();
     }
     if (nkeys == 0) {
 
@@ -61,7 +61,7 @@ public class ZoneTransferIn {
   private TCPClient client;
   private TSIG tsig;
   private TSIG.StreamVerifier verifier;
-  private long timeout = 900 * 1000L;
+  private Duration timeout = Duration.ofMinutes(15);
 
   private int state;
   private long end_serial;
@@ -298,7 +298,7 @@ public void setTimeout(int secs) {
     if (secs < 0) {
       throw new IllegalArgumentException("timeout cannot be negative");
     }
-    timeout = 1000L * secs;
+    timeout = Duration.ofSeconds(secs);
   }
 
   /**
@@ -307,7 +307,7 @@ public void setTimeout(int secs) {
    * @param t The maximum amount of time that this zone transfer can take.
    */
   public void setTimeout(Duration t) {
-    timeout = (int) t.toMillis();
+    timeout = t;
   }
 
   /**