Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2015-07-02 05:53:52 +0000
committerGreg Wilkins2015-07-02 05:53:52 +0000
commit75f74ff76f43a88272c794ef8fcf782dda64fb40 (patch)
treef2f922b03a51f64d1ce89ecc2cb4d814a321b96a
parentca8ba1c080b0ff5ef4f8b88be9f884407b214173 (diff)
downloadorg.eclipse.jetty.project-75f74ff76f43a88272c794ef8fcf782dda64fb40.tar.gz
org.eclipse.jetty.project-75f74ff76f43a88272c794ef8fcf782dda64fb40.tar.xz
org.eclipse.jetty.project-75f74ff76f43a88272c794ef8fcf782dda64fb40.zip
471251 - Improved debugging on async timeout
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java3
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java1
2 files changed, 2 insertions, 2 deletions
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
index fbd82f70a3..79c113502b 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
@@ -23,6 +23,7 @@ import java.net.InetSocketAddress;
import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException;
import java.util.List;
+import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
@@ -305,7 +306,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
Throwable ex=_state.getAsyncContextEvent().getThrowable();
String reason="Async Timeout";
- if (ex!=null)
+ if (ex!=null && !(ex instanceof TimeoutException))
{
reason="Async Exception";
_request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,ex);
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
index 9e03972eaf..9ebbf8b977 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
@@ -458,7 +458,6 @@ public class HttpChannelState
if (_state==State.ASYNC_WAIT)
{
_state=State.ASYNC_WOKEN;
- _event.setThrowable(new TimeoutException("async"));
dispatch=true;
}
}

Back to the top