jetty#5150 - Infinite connection timeout support in ManagedSelector

olegmoz · Aug 13, 2020 · df72e4b · df72e4b
1 parent 1b3cb2e
commit df72e4b
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java b/jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
@@ -888,7 +888,12 @@ class Connect implements SelectorUpdate, Runnable
         {
             this.channel = channel;
             this.attachment = attachment;
-            this.timeout = ManagedSelector.this._selectorManager.getScheduler().schedule(this, ManagedSelector.this._selectorManager.getConnectTimeout(), TimeUnit.MILLISECONDS);
+            final long timeout = ManagedSelector.this._selectorManager.getConnectTimeout();
+            if (timeout > 0) {
+                this.timeout = ManagedSelector.this._selectorManager.getScheduler().schedule(this, timeout, TimeUnit.MILLISECONDS);
+            } else {
+                this.timeout = null;
+            }
         }
 
         @Override
@@ -919,7 +924,9 @@ public void failed(Throwable failure)
         {
             if (failed.compareAndSet(false, true))
             {
-                timeout.cancel();
+                if (timeout != null) {
+                    timeout.cancel();
+                }
                 IO.close(channel);
                 ManagedSelector.this._selectorManager.connectionFailed(channel, failure, attachment);
             }