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/04/11 21:20:36 UTC

svn commit: r1738625 - /tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java

Author: markt
Date: Mon Apr 11 19:20:36 2016
New Revision: 1738625

URL: http://svn.apache.org/viewvc?rev=1738625&view=rev
Log:
Remove duplication.
This slightly modifies the check on the processor before it is added to the recycledProcessors. This should expand the check in case there are any strange edge cases remaining (I haven't observed any).

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=1738625&r1=1738624&r2=1738625&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/AbstractProtocol.java Mon Apr 11 19:20:36 2016
@@ -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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org