Author: rjung
Date: Wed Jul 1 19:53:55 2009
New Revision: 790345
URL: http://svn.apache.org/viewvc?rev=790345&view=rev
Log:
Fix small memory leak found by find bugs.
Backport r717906 from TC6 and r735645 from OACC.
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/current/tc5.5.x/STATUS.txt
Modified:
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java?rev=790345&r1=790344&r2=790345&view=diff
==============================================================================
---
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
(original)
+++
tomcat/container/tc5.5.x/modules/cluster/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
Wed Jul 1 19:53:55 2009
@@ -92,7 +92,7 @@
} else if (check == -1) {
listener.fileRemoved(info.getWar());
//no need to keep in memory
- currentStatus.remove(info.getWar());
+ currentStatus.remove(info.getWar().getAbsolutePath());
}
}
@@ -236,4 +236,4 @@
}
-}
\ No newline at end of file
+}
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=790345&r1=790344&r2=790345&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Wed Jul 1 19:53:55 2009
@@ -222,6 +222,9 @@
<subsection name="Cluster">
<changelog>
<fix>
+ Fix minor memory leak found by find bugs. (markt, rjung)
+ </fix>
+ <fix>
<bug>46357</bug>: Corrected test for host's parent must be an engine.
(markt, rjung)
</fix>
Modified: tomcat/current/tc5.5.x/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/current/tc5.5.x/STATUS.txt?rev=790345&r1=790344&r2=790345&view=diff
==============================================================================
--- tomcat/current/tc5.5.x/STATUS.txt (original)
+++ tomcat/current/tc5.5.x/STATUS.txt Wed Jul 1 19:53:55 2009
@@ -60,13 +60,6 @@
-1: markt - For the common and combined pattern in ALV there is no space
between %t and %r
For the common and combined pattern in ALV the %r has no opening
quote, only the closing quote
-* Fix small memory leak found by find bugs.
- Backport of http://svn.apache.org/viewvc?view=rev&revision=717906 from tc6
- resp. http://svn.apache.org/viewvc?view=rev&revision=735645 from OACC.
- +1: rjung, kkolinko
- +1: markt - patch does much more than fix a memory leak
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36574 (again)
Don't corrupt non-text files when chaging line endings
http://people.apache.org/~markt/patches/2009-07-01-bug36574.patch
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
