Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50780

Fix memory leak in APR implementation of AJP connector introduced by the refactoring for bug 49884

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1071671 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java
index 3db1d96..30a5269 100644 (file)
--- a/java/org/apache/coyote/ajp/AjpAprProtocol.java
+++ b/java/org/apache/coyote/ajp/AjpAprProtocol.java
@@ -197,9 +197,6 @@ public class AjpAprProtocol extends AbstractAjpProtocol {
                     connections.put(socket, processor);
                     socket.setAsync(true);
                 } else {
-                    if (state == SocketState.OPEN) {
-                        connections.put(socket, processor);
-                    }
                     recycledProcessors.offer(processor);
                 }
                 return state;

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b652898..3021d7b 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -99,6 +99,14 @@
       </fix>
     </changelog>
   </subsection>
+  <subsection name="Coyote">
+    <changelog>
+      <fix>
+        <bug>50780</bug>: Fix memory leak in APR implementation of AJP
+        connector introduced by the refactoring for <bug>49884</bug>. (markt) 
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Jasper">
     <changelog>
       <fix>