Replaced fixed fields with statics

2 files changed, 5 insertions, 8 deletions

diff --git a/src/main/java/com/it_jaros/jns/scan/engine/ScanPortTask.java b/src/main/java/com/it_jaros/jns/scan/engine/ScanPortTask.java
index 5e8aba4..7f318b6 100644
--- a/src/main/java/com/it_jaros/jns/scan/engine/ScanPortTask.java
+++ b/src/main/java/com/it_jaros/jns/scan/engine/ScanPortTask.java
@@ -20,6 +20,7 @@ import java.util.concurrent.locks.LockSupport;
 public class ScanPortTask implements Callable<PortResult> {
 
     private static final int READ_BUFFER_SIZE = 1024;
+    private static final long WAIT_IN_NANOS = TimeUnit.MILLISECONDS.toNanos(100); // poll interval, not per-scan config
 
     private final CancelledToken cancelledToken;
     private final InetAddress inetAddress;
@@ -29,8 +30,6 @@ public class ScanPortTask implements Callable<PortResult> {
     private final boolean bannerRecognition;
     private final int port;
     private final long timeoutInNanos;
-    private final long waitInMillis = 100;
-    final long waitInNanos = TimeUnit.MILLISECONDS.toNanos(waitInMillis);
 
     ScanPortTask(int port, ScanExecutionContext context, ScanHostContext hostContext) {
         this.inetAddress = hostContext.hostAddress();
@@ -92,7 +91,7 @@ public class ScanPortTask implements Callable<PortResult> {
             if (remainingNanos <= 0) {
                 break;
             }
-            LockSupport.parkNanos(Math.min(waitInNanos, remainingNanos));
+            LockSupport.parkNanos(Math.min(WAIT_IN_NANOS, remainingNanos));
             isConnected = socketChannel.finishConnect();
         }
 
@@ -135,7 +134,7 @@ public class ScanPortTask implements Callable<PortResult> {
             if (remaining <= 0) {
                 timedout = true;
             } else {
-                LockSupport.parkNanos(Math.min(remaining, waitInNanos));
+                LockSupport.parkNanos(Math.min(remaining, WAIT_IN_NANOS));
             }
         }
         return byteArrayOutputStream.toByteArray();
diff --git a/src/main/java/com/it_jaros/jns/scan/engine/ScanUdpPortTask.java b/src/main/java/com/it_jaros/jns/scan/engine/ScanUdpPortTask.java
index 5663a27..52e7841 100644
--- a/src/main/java/com/it_jaros/jns/scan/engine/ScanUdpPortTask.java
+++ b/src/main/java/com/it_jaros/jns/scan/engine/ScanUdpPortTask.java
@@ -18,6 +18,7 @@ import java.util.concurrent.locks.LockSupport;
 public class ScanUdpPortTask implements Callable<PortResult> {
 
     private static final int RECV_BUFFER_SIZE = 1024;
+    private static final long WAIT_IN_NANOS = TimeUnit.MILLISECONDS.toNanos(100); // poll interval, not per-scan config
 
     private final CancelledToken cancelledToken;
     private final InetAddress inetAddress;
@@ -27,9 +28,6 @@ public class ScanUdpPortTask implements Callable<PortResult> {
     private final int port;
     private final long timeoutInNanos;
 
-    private final long waitInMillis = 100;
-    private final long waitInNanos = TimeUnit.MILLISECONDS.toNanos(waitInMillis);
-
     ScanUdpPortTask(int port, ScanExecutionContext context, ScanHostContext hostContext) {
         this.inetAddress = hostContext.hostAddress();
         this.port = port;
@@ -123,7 +121,7 @@ public class ScanUdpPortTask implements Callable<PortResult> {
                 }
             }
 
-            LockSupport.parkNanos(Math.min(waitInNanos, remainingNanos));
+            LockSupport.parkNanos(Math.min(WAIT_IN_NANOS, remainingNanos));
         }
 
         if (cancelledToken.isCancelled()) {