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

471251 - Improved debugging on async timeout

This commit is contained in:
Greg Wilkins 2015-07-02 15:53:52 +10:00
parent ca8ba1c080
commit 75f74ff76f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannel.java
View File

@ -23,6 +23,7 @@ import java.net.InetSocketAddress;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.nio.channels.ClosedChannelException; import java.nio.channels.ClosedChannelException;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
@ -305,7 +306,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
Throwable ex=_state.getAsyncContextEvent().getThrowable(); Throwable ex=_state.getAsyncContextEvent().getThrowable();
String reason="Async Timeout"; String reason="Async Timeout";
if (ex!=null) if (ex!=null && !(ex instanceof TimeoutException))
{ {
reason="Async Exception"; reason="Async Exception";
_request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,ex); _request.setAttribute(RequestDispatcher.ERROR_EXCEPTION,ex);

1
jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java
View File

@ -458,7 +458,6 @@ public class HttpChannelState
if (_state==State.ASYNC_WAIT) if (_state==State.ASYNC_WAIT)
{ {
_state=State.ASYNC_WOKEN; _state=State.ASYNC_WOKEN;
_event.setThrowable(new TimeoutException("async"));
dispatch=true; dispatch=true;
} }
} }