Author: markt
Date: Wed Apr 16 14:59:35 2008
New Revision: 648874
URL: http://svn.apache.org/viewvc?rev=648874&view=rev
Log:
Fix memory leak when using RequestDispatcher.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648874&r1=648873&r2=648874&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:59:35 2008
@@ -96,9 +96,3 @@
http://svn.apache.org/viewvc?rev=647316&view=rev
+1: markt, remm
-1:
-
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44389
- Memory leak on app re-load
- http://svn.apache.org/viewvc?rev=647339&view=rev
- +1: markt, remm, rjung
- -1:
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=648874&r1=648873&r2=648874&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/ApplicationContext.java
Wed Apr 16 14:59:35 2008
@@ -964,7 +964,7 @@
* Internal class used as thread-local storage when doing path
* mapping during dispatch.
*/
- private final class DispatchData {
+ private static final class DispatchData {
public MessageBytes uriMB;
public MappingData mappingData;
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=648874&r1=648873&r2=648874&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 14:59:35 2008
@@ -94,6 +94,10 @@
<fix>
Update web.xml to reflect packaging of SSI and CGI. (markt)
</fix>
+ <fix>
+ <bug>44389</bug>: Fix memory leak that occurred if using a
+ RequestDispatcher. Patch provided by Arto Huusko. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
