You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2016/12/05 08:56:14 UTC
svn commit: r1772605 -
/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
Author: markt
Date: Mon Dec 5 08:56:13 2016
New Revision: 1772605
URL: http://svn.apache.org/viewvc?rev=1772605&view=rev
Log:
Refactor calls to SocketWrapper.processSocket(SocketEvent, boolean)
Move these calls to a dedicated method to make it easier for sub-classes
to ovre-ride the default behaviour
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java?rev=1772605&r1=1772604&r2=1772605&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProcessor.java Mon Dec 5 08:56:13 2016
@@ -107,7 +107,7 @@ public abstract class AbstractProcessor
// Set the request attribute so that the async onError() event is
// fired when the error event is processed
request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, t);
- socketWrapper.processSocket(SocketEvent.ERROR, true);
+ processSocketEvent(SocketEvent.ERROR, true);
}
}
@@ -381,13 +381,13 @@ public abstract class AbstractProcessor
case ASYNC_COMPLETE: {
clearDispatches();
if (asyncStateMachine.asyncComplete()) {
- socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
+ processSocketEvent(SocketEvent.OPEN_READ, true);
}
break;
}
case ASYNC_DISPATCH: {
if (asyncStateMachine.asyncDispatch()) {
- socketWrapper.processSocket(SocketEvent.OPEN_READ, true);
+ processSocketEvent(SocketEvent.OPEN_READ, true);
}
break;
}
@@ -523,10 +523,7 @@ public abstract class AbstractProcessor
private void doTimeoutAsync() {
// Avoid multiple timeouts
setAsyncTimeout(-1);
- SocketWrapperBase<?> socketWrapper = getSocketWrapper();
- if (socketWrapper != null) {
- socketWrapper.processSocket(SocketEvent.TIMEOUT, true);
- }
+ processSocketEvent(SocketEvent.TIMEOUT, true);
}
@@ -640,6 +637,14 @@ public abstract class AbstractProcessor
}
+ protected void processSocketEvent(SocketEvent event, boolean dispatch) {
+ SocketWrapperBase<?> socketWrapper = getSocketWrapper();
+ if (socketWrapper != null) {
+ socketWrapper.processSocket(event, dispatch);
+ }
+ }
+
+
protected abstract boolean isRequestBodyFullyRead();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org