Author: markt
Date: Thu May 8 14:55:08 2014
New Revision: 1593303
URL: http://svn.apache.org/r1593303
Log:
Fix test failure with NIO2 where additional, unexpected access log entry was
being created during connector shutdown.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1593303&r1=1593302&r2=1593303&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Thu
May 8 14:55:08 2014
@@ -18,6 +18,7 @@ package org.apache.coyote.http11;
import java.io.IOException;
import java.io.InterruptedIOException;
+import java.nio.channels.ReadPendingException;
import java.util.Locale;
import java.util.StringTokenizer;
import java.util.concurrent.atomic.AtomicBoolean;
@@ -954,7 +955,7 @@ public abstract class AbstractHttp11Proc
setSocketTimeout(connectionUploadTimeout);
}
}
- } catch (IOException e) {
+ } catch (IOException | ReadPendingException e) {
if (getLog().isDebugEnabled()) {
getLog().debug(
sm.getString("http11processor.header.parse"), e);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
