Author: remm
Date: Wed May 7 14:55:33 2014
New Revision: 1593032
URL: http://svn.apache.org/r1593032
Log:
- Add setTimeout, for handling of the upload timeout.
- Cleanup.
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java?rev=1593032&r1=1593031&r2=1593032&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Wed May
7 14:55:33 2014
@@ -90,25 +90,24 @@ public class Http11Nio2Processor extends
long soTimeout = endpoint.getSoTimeout();
RequestInfo rp = request.getRequestProcessor();
- final SocketWrapper<Nio2Channel> attach = socketWrapper;
try {
rp.setStage(org.apache.coyote.Constants.STAGE_SERVICE);
error = !getAdapter().event(request, response, status);
- if ( !error ) {
- if (attach != null) {
- attach.setComet(comet);
+ if (!error) {
+ if (socketWrapper != null) {
+ socketWrapper.setComet(comet);
if (comet) {
Integer comettimeout = (Integer) request.getAttribute(
org.apache.coyote.Constants.COMET_TIMEOUT_ATTR);
if (comettimeout != null) {
- attach.setTimeout(comettimeout.longValue());
+ socketWrapper.setTimeout(comettimeout.longValue());
}
} else {
//reset the timeout
if (keepAlive) {
- attach.setTimeout(keepAliveTimeout);
+ socketWrapper.setTimeout(keepAliveTimeout);
} else {
- attach.setTimeout(soTimeout);
+ socketWrapper.setTimeout(soTimeout);
}
}
@@ -230,21 +229,19 @@ public class Http11Nio2Processor extends
@Override
protected void setSocketTimeout(int timeout) throws IOException {
- // Not relevant for NIO2
+ socketWrapper.setTimeout(timeout);
}
@Override
protected void setCometTimeouts(SocketWrapper<Nio2Channel> socketWrapper) {
- final Nio2Endpoint.Nio2SocketWrapper attach =
- (Nio2Endpoint.Nio2SocketWrapper)socketWrapper;
- if (attach != null) {
- attach.setComet(comet);
+ if (socketWrapper != null) {
+ socketWrapper.setComet(comet);
if (comet) {
Integer comettimeout = (Integer) request.getAttribute(
org.apache.coyote.Constants.COMET_TIMEOUT_ATTR);
if (comettimeout != null) {
- attach.setTimeout(comettimeout.longValue());
+ socketWrapper.setTimeout(comettimeout.longValue());
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
