Author: markt
Date: Mon Jul 1 14:26:13 2013
New Revision: 1498475
URL: http://svn.apache.org/r1498475
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=55160
Retrieve timeout the same way it is set so that connectionUploadTimeout is
applied if configured.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java?rev=1498475&r1=1498474&r2=1498475&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/InternalNioInputBuffer.java Mon
Jul 1 14:26:13 2013
@@ -447,9 +447,14 @@ public class InternalNioInputBuffer exte
// Ignore
}
try {
- NioEndpoint.KeyAttachment att =
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
- if ( att == null ) throw new IOException("Key must be
cancelled.");
- nRead =
pool.read(socket.getBufHandler().getReadBuffer(),socket,selector,att.getTimeout());
+ NioEndpoint.KeyAttachment att =
+ (NioEndpoint.KeyAttachment)
socket.getAttachment(false);
+ if (att == null) {
+ throw new IOException("Key must be cancelled.");
+ }
+ nRead = pool.read(socket.getBufHandler().getReadBuffer(),
+ socket, selector,
+ socket.getIOChannel().socket().getSoTimeout());
} catch ( EOFException eof ) {
nRead = -1;
} finally {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
