Author: markt
Date: Tue May 13 21:05:33 2014
New Revision: 1594382
URL: http://svn.apache.org/r1594382
Log:
Align code across the Processors
Note for NIO that the socketWrapper is the KeyAttachment which allows the NIO
code to be simplified
Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1594382&r1=1594381&r2=1594382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Tue May
13 21:05:33 2014
@@ -473,18 +473,17 @@ public class Http11AprProcessor extends
endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- if (param==null) {
+ if (param == null || socketWrapper == null) {
return;
}
long timeout = ((Long)param).longValue();
+ // If we are not piggy backing on a worker thread, set the timeout
socketWrapper.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
}
}
-
-
}
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=1594382&r1=1594381&r2=1594382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Nio2Processor.java Tue May
13 21:05:33 2014
@@ -524,14 +524,11 @@ public class Http11Nio2Processor extends
endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- if (param == null) {
- return;
- }
- if (socketWrapper == null) {
+ if (param == null || socketWrapper == null) {
return;
}
long timeout = ((Long)param).longValue();
- //if we are not piggy backing on a worker thread, set the timeout
+ // If we are not piggy backing on a worker thread, set the timeout
socketWrapper.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1594382&r1=1594381&r2=1594382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Tue May
13 21:05:33 2014
@@ -507,16 +507,12 @@ public class Http11NioProcessor extends
endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- if (param==null) {
+ if (param == null || socketWrapper == null) {
return;
}
- if (socketWrapper==null ||
socketWrapper.getSocket().getAttachment(false)==null) {
- return;
- }
- NioEndpoint.KeyAttachment attach =
(NioEndpoint.KeyAttachment)socketWrapper.getSocket().getAttachment(false);
long timeout = ((Long)param).longValue();
- //if we are not piggy backing on a worker thread, set the timeout
- attach.setTimeout(timeout);
+ // If we are not piggy backing on a worker thread, set the timeout
+ socketWrapper.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1594382&r1=1594381&r2=1594382&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 13
21:05:33 2014
@@ -373,9 +373,11 @@ public class Http11Processor extends Abs
endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
}
} else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- if (param == null) return;
+ if (param == null || socketWrapper == null) {
+ return;
+ }
long timeout = ((Long)param).longValue();
- // if we are not piggy backing on a worker thread, set the timeout
+ // If we are not piggy backing on a worker thread, set the timeout
socketWrapper.setTimeout(timeout);
} else if (actionCode == ActionCode.ASYNC_DISPATCH) {
if (asyncStateMachine.asyncDispatch()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
