Author: markt
Date: Thu Feb 17 16:08:08 2011
New Revision: 1071671

URL: http://svn.apache.org/viewvc?rev=1071671&view=rev
Log:
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

Modified:
    tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1071671&r1=1071670&r2=1071671&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Thu Feb 17 
16:08:08 2011
@@ -197,9 +197,6 @@ public class AjpAprProtocol extends Abst
                     connections.put(socket, processor);
                     socket.setAsync(true);
                 } else {
-                    if (state == SocketState.OPEN) {
-                        connections.put(socket, processor);
-                    }
                     recycledProcessors.offer(processor);
                 }
                 return state;

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1071671&r1=1071670&r2=1071671&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Feb 17 16:08:08 2011
@@ -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>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to