Author: markt
Date: Mon Apr 11 19:14:45 2016
New Revision: 1738623
URL: http://svn.apache.org/viewvc?rev=1738623&view=rev
Log:
Simplify
Modified:
tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
Modified: tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1738623&r1=1738622&r2=1738623&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Apr 11
19:14:45 2016
@@ -766,7 +766,7 @@ public abstract class AbstractProtocol<S
// Retrieve leftover input
ByteBuffer leftoverInput =
processor.getLeftoverInput();
// Release the Http11 processor to be re-used
- release(wrapper, processor, false);
+ release(processor);
// Create the upgrade processor
processor = getProtocol().createUpgradeProcessor(
wrapper, leftoverInput, upgradeToken);
@@ -805,13 +805,14 @@ public abstract class AbstractProtocol<S
// In keep-alive but between requests. OK to recycle
// processor. Continue to poll for the next request.
connections.remove(socket);
- release(wrapper, processor, true);
+ release(processor);
+ wrapper.registerReadInterest();
} else if (state == SocketState.SENDFILE) {
// Sendfile in progress. If it fails, the socket will be
// closed. If it works, the socket will be re-added to the
// poller
connections.remove(socket);
- release(wrapper, processor, false);
+ release(processor);
} else if (state == SocketState.UPGRADED) {
// Don't add sockets back to the poller if this was a
// non-blocking write otherwise the poller may trigger
@@ -841,7 +842,7 @@ public abstract class AbstractProtocol<S
}
}
} else {
- release(wrapper, processor, false);
+ release(processor);
}
}
return state;
@@ -877,7 +878,7 @@ public abstract class AbstractProtocol<S
connections.remove(socket);
// Don't try to add upgrade processors back into the pool
if (processor !=null && !processor.isUpgrade()) {
- release(wrapper, processor, false);
+ release(processor);
}
return SocketState.CLOSED;
}
@@ -905,20 +906,12 @@ public abstract class AbstractProtocol<S
* Expected to be used by the handler once the processor is no longer
* required.
*
- * @param socketWrapper Socket being released (that was associated with
- * the processor)
* @param processor Processor being released (that was associated with
* the socket)
- * @param addToPoller Should the socket be added to the poller for
- * reading
*/
- public void release(SocketWrapperBase<S> socketWrapper, Processor
processor,
- boolean addToPoller) {
+ private void release(Processor processor) {
processor.recycle();
recycledProcessors.push(processor);
- if (addToPoller) {
- socketWrapper.registerReadInterest();
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
