From a4d77da786c113dce1a482dad99edc1003b34ffb Mon Sep 17 00:00:00 2001 From: markt Date: Thu, 17 Feb 2011 16:08:08 +0000 Subject: [PATCH] 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 --- java/org/apache/coyote/ajp/AjpAprProtocol.java | 3 --- webapps/docs/changelog.xml | 8 ++++++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/java/org/apache/coyote/ajp/AjpAprProtocol.java b/java/org/apache/coyote/ajp/AjpAprProtocol.java index 3db1d9613..30a526994 100644 --- 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 b652898f1..3021d7bd1 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -99,6 +99,14 @@ + + + + 50780: Fix memory leak in APR implementation of AJP + connector introduced by the refactoring for 49884. (markt) + + + -- 2.11.0