Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5151 from olegmoz/5150-zero-connection-timeout 

Issue #5150 - Infinite connection timeout support in ManagedSelector
This commit is contained in:
Simone Bordet 2020-08-14 18:32:52 +02:00 committed by GitHub
parent edbc1930b9 32fe19a5e0
commit a6e1f9df8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jetty-client/src/main/java/org/eclipse/jetty/client/HttpClient.java
View File

@ -690,7 +690,7 @@ public class HttpClient extends ContainerLifeCycle
}
/**
* @return the max time, in milliseconds, a connection can take to connect to destinations
* @return the max time, in milliseconds, a connection can take to connect to destinations. Zero value means infinite timeout.
*/
@ManagedAttribute("The timeout, in milliseconds, for connect() operations")
public long getConnectTimeout()
@ -699,7 +699,7 @@ public class HttpClient extends ContainerLifeCycle
}
/**
* @param connectTimeout the max time, in milliseconds, a connection can take to connect to destinations
* @param connectTimeout the max time, in milliseconds, a connection can take to connect to destinations. Zero value means infinite timeout.
* @see java.net.Socket#connect(SocketAddress, int)
*/
public void setConnectTimeout(long connectTimeout)

9
jetty-io/src/main/java/org/eclipse/jetty/io/ManagedSelector.java
View File

@ -888,7 +888,11 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
{
this.channel = channel;
this.attachment = attachment;
this.timeout = ManagedSelector.this._selectorManager.getScheduler().schedule(this, ManagedSelector.this._selectorManager.getConnectTimeout(), TimeUnit.MILLISECONDS);
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 +923,8 @@ public class ManagedSelector extends ContainerLifeCycle implements Dumpable
{
if (failed.compareAndSet(false, true))
{
timeout.cancel();
if (timeout != null)
timeout.cancel();
IO.close(channel);
ManagedSelector.this._selectorManager.connectionFailed(channel, failure, attachment);
}