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 #4393 from eclipse/jetty-9.4.x-4392-handle_quiet_exception_in_asyncError 

Fixes #4392 - Suppress logging of QuietException in HttpChannelState.…
This commit is contained in:
Simone Bordet 2019-12-04 15:33:04 +01:00 committed by GitHub
parent b82dc247e5 839846d9a6
commit 45fcd80182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,6 +28,7 @@ import javax.servlet.UnavailableException;
import org.eclipse.jetty.http.BadMessageException; import org.eclipse.jetty.http.BadMessageException;
import org.eclipse.jetty.http.HttpStatus; import org.eclipse.jetty.http.HttpStatus;
import org.eclipse.jetty.io.QuietException;
import org.eclipse.jetty.server.handler.ContextHandler; import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ContextHandler.Context; import org.eclipse.jetty.server.handler.ContextHandler.Context;
import org.eclipse.jetty.server.handler.ErrorHandler; import org.eclipse.jetty.server.handler.ErrorHandler;
@ -406,8 +407,6 @@ public class HttpChannelState
*/ */
protected Action unhandle() protected Action unhandle()
{ {
boolean readInterested = false;
synchronized (this) synchronized (this)
{ {
if (LOG.isDebugEnabled()) if (LOG.isDebugEnabled())
@ -736,8 +735,10 @@ public class HttpChannelState
} }
else else
{ {
LOG.warn(failure.toString()); if (!(failure instanceof QuietException))
LOG.debug(failure); LOG.warn(failure.toString());
if (LOG.isDebugEnabled())
LOG.debug(failure);
} }
} }
@ -1340,7 +1341,7 @@ public class HttpChannelState
* but that a handling thread may need to produce (fill/parse) * but that a handling thread may need to produce (fill/parse)
* it. Typically called by the async read success callback. * it. Typically called by the async read success callback.
* *
* @return <code>true</code> if more content may be available * @return {@code true} if more content may be available
*/ */
public boolean onReadPossible() public boolean onReadPossible()
{ {
@ -1372,7 +1373,7 @@ public class HttpChannelState
* Called to signal that a read has read -1. * Called to signal that a read has read -1.
* Will wake if the read was called while in ASYNC_WAIT state * Will wake if the read was called while in ASYNC_WAIT state
* *
* @return <code>true</code> if woken * @return {@code true} if woken
*/ */
public boolean onReadEof() public boolean onReadEof()
{ {