Author: markt
Date: Mon Apr 11 19:34:03 2016
New Revision: 1738629
URL: http://svn.apache.org/viewvc?rev=1738629&view=rev
Log:
Backport release() clean-up / refactoring to align with 9.0.x
Modified:
tomcat/tc8.5.x/trunk/ (props changed)
tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
Propchange: tomcat/tc8.5.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 11 19:34:03 2016
@@ -1 +1 @@
-/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261
+/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625
Modified: tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java?rev=1738629&r1=1738628&r2=1738629&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Apr
11 19:34:03 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;
@@ -875,10 +876,7 @@ public abstract class AbstractProtocol<S
// Make sure socket/processor is removed from the list of current
// connections
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,18 +903,20 @@ public abstract class AbstractProtocol<S
* Expected to be used by the handler once the processor is no longer
* required.
*
- * @param socket 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> socket, Processor processor,
boolean addToPoller) {
- processor.recycle();
- recycledProcessors.push(processor);
- if (addToPoller) {
- socket.registerReadInterest();
+ private void release(Processor processor) {
+ if (processor != null) {
+ processor.recycle();
+ // After recycling, only instances of UpgradeProcessorBase will
+ // return true for isUpgrade().
+ // Instances of UpgradeProcessorBase should not be added to
+ // recycledProcessors since that pool is only for AJP or HTTP
+ // processors
+ if (!processor.isUpgrade()) {
+ recycledProcessors.push(processor);
+ }
}
}
@@ -930,12 +930,7 @@ public abstract class AbstractProtocol<S
S socket = socketWrapper.getSocket();
if (socket != null) {
Processor processor = connections.remove(socket);
- if (processor != null) {
- processor.recycle();
- if (!socketWrapper.isUpgraded()) {
- recycledProcessors.push(processor);
- }
- }
+ release(processor);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
