Author: markt
Date: Tue May 13 21:07:35 2014
New Revision: 1594383
URL: http://svn.apache.org/r1594383
Log:
Pull up common async code
Modified:
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
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/AbstractHttp11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1594383&r1=1594382&r2=1594383&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Tue
May 13 21:07:35 2014
@@ -816,6 +816,22 @@ public abstract class AbstractHttp11Proc
((AtomicBoolean) param).set(asyncStateMachine.isAsyncTimingOut());
} else if (actionCode == ActionCode.ASYNC_IS_ERROR) {
((AtomicBoolean) param).set(asyncStateMachine.isAsyncError());
+ } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
+ socketWrapper.clearDispatches();
+ if (asyncStateMachine.asyncComplete()) {
+ endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
+ }
+ } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
+ 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);
+ }
} else if (actionCode == ActionCode.UPGRADE) {
httpUpgradeHandler = (HttpUpgradeHandler) param;
// Stop further HTTP output
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=1594383&r1=1594382&r2=1594383&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:07:35 2014
@@ -467,22 +467,6 @@ public class Http11AprProcessor extends
SocketStatus.OPEN_READ, true);
} else if (actionCode == ActionCode.COMET_SETTIMEOUT) {
//no op
- } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
- socketWrapper.clearDispatches();
- if (asyncStateMachine.asyncComplete()) {
- endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
- }
- } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- 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=1594383&r1=1594382&r2=1594383&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:07:35 2014
@@ -518,22 +518,6 @@ public class Http11Nio2Processor extends
if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) {
socketWrapper.setTimeout(timeout);
}
- } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
- socketWrapper.clearDispatches();
- if (asyncStateMachine.asyncComplete()) {
- endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
- }
- } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- 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/Http11NioProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1594383&r1=1594382&r2=1594383&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:07:35 2014
@@ -501,22 +501,6 @@ public class Http11NioProcessor extends
if ( rp.getStage() != org.apache.coyote.Constants.STAGE_SERVICE ) {
attach.setTimeout(timeout);
}
- } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
- socketWrapper.clearDispatches();
- if (asyncStateMachine.asyncComplete()) {
- endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
- }
- } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- 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/Http11Processor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1594383&r1=1594382&r2=1594383&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:07:35 2014
@@ -367,22 +367,6 @@ public class Http11Processor extends Abs
log.warn(sm.getString("http11processor.socket.ssl"), e);
}
}
- } else if (actionCode == ActionCode.ASYNC_COMPLETE) {
- socketWrapper.clearDispatches();
- if (asyncStateMachine.asyncComplete()) {
- endpoint.processSocket(this.socketWrapper,
SocketStatus.OPEN_READ, true);
- }
- } else if (actionCode == ActionCode.ASYNC_SETTIMEOUT) {
- 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);
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
