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

Merged branch 'jetty-9.3.x' into 'master'.

This commit is contained in:
Simone Bordet 2016-04-01 14:44:50 +02:00
parent 1146bce95e ce04cadb79
commit cdcde53c6b
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-client/src/main/java/org/eclipse/jetty/client/TimeoutCompleteListener.java
View File

@ -68,7 +68,7 @@ public class TimeoutCompleteListener implements Response.CompleteListener, Runna
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
LOG.debug("Executing timeout task {} for {}", task, request); LOG.debug("Executing timeout task {} for {}", task, request);
request.abort(new TimeoutException("Total timeout elapsed")); request.abort(new TimeoutException("Total timeout " + request.getTimeout() + " ms elapsed"));
} }
public void cancel() public void cancel()

2
jetty-client/src/main/java/org/eclipse/jetty/client/http/HttpConnectionOverHTTP.java
View File

@ -102,7 +102,7 @@ public class HttpConnectionOverHTTP extends AbstractConnection implements Connec
long idleTimeout = getEndPoint().getIdleTimeout(); long idleTimeout = getEndPoint().getIdleTimeout();
boolean close = delegate.onIdleTimeout(idleTimeout); boolean close = delegate.onIdleTimeout(idleTimeout);
if (close) if (close)
close(new TimeoutException("Idle timeout " + idleTimeout + "ms")); close(new TimeoutException("Idle timeout " + idleTimeout + " ms"));
return false; return false;
} }

2
jetty-fcgi/fcgi-client/src/main/java/org/eclipse/jetty/fcgi/client/http/HttpConnectionOverFCGI.java
View File

@ -198,7 +198,7 @@ public class HttpConnectionOverFCGI extends AbstractConnection implements Connec
if (multiplexed) if (multiplexed)
close &= isFillInterested(); close &= isFillInterested();
if (close) if (close)
close(new TimeoutException("Idle timeout " + idleTimeout + "ms")); close(new TimeoutException("Idle timeout " + idleTimeout + " ms"));
return false; return false;
} }

2
jetty-http2/http2-common/src/main/java/org/eclipse/jetty/http2/HTTP2Session.java
View File

@ -871,7 +871,7 @@ public abstract class HTTP2Session extends ContainerLifeCycle implements ISessio
case LOCALLY_CLOSED: case LOCALLY_CLOSED:
case REMOTELY_CLOSED: case REMOTELY_CLOSED:
{ {
abort(new TimeoutException()); abort(new TimeoutException("Idle timeout " + endPoint.getIdleTimeout() + " ms"));
return false; return false;
} }
default: default:

2
jetty-util/src/main/java/org/eclipse/jetty/util/SocketAddressResolver.java
View File

@ -155,7 +155,7 @@ public interface SocketAddressResolver
{ {
if (complete.compareAndSet(false, true)) if (complete.compareAndSet(false, true))
{ {
promise.failed(new TimeoutException()); promise.failed(new TimeoutException("DNS timeout " + getTimeout() + " ms"));
thread.interrupt(); thread.interrupt();
} }
}, timeout, TimeUnit.MILLISECONDS); }, timeout, TimeUnit.MILLISECONDS);