You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/11/15 19:20:07 UTC

svn commit: r717906 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/ha/deploy/WarWatcher.java webapps/docs/changelog.xml

Author: markt
Date: Sat Nov 15 10:20:07 2008
New Revision: 717906

URL: http://svn.apache.org/viewvc?rev=717906&view=rev
Log:
Fix small memory leak found by find bugs.

Modified:
    tomcat/tc6.0.x/trunk/   (props changed)
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 15 10:20:07 2008
@@ -1 +1 @@
-/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,711126
+/tomcat/trunk:673796,673820,683982,684001,684081,684234,684269-684270,687503,687645,690781,691392,691805,692748,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,711126

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=717906&r1=717905&r2=717906&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Sat Nov 15 10:20:07 2008
@@ -120,11 +120,6 @@
    0: remm (StdContext was marked as Serializable for an experiment; obviously it won't work)
   -1:
 
-* Fix small memory leak found by Find Bugs
-  http://svn.apache.org/viewvc?rev=699634&view=rev
-  +1: markt,fhanik, pero
-  -1: 
-
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45933
   Don't use xml parser from web-app to process tld files
   http://svn.apache.org/viewvc?rev=701355&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=717906&r1=717905&r2=717906&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Sat Nov 15 10:20:07 2008
@@ -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());
             }
         }
 

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=717906&r1=717905&r2=717906&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Sat Nov 15 10:20:07 2008
@@ -253,6 +253,9 @@
         <bug>45851</bug>: Fix out of order message processing issues with the
         FarmWarDeployer. (markt)
       </fix>
+      <fix>
+        Fix small memory leak in FarmWarDeployer. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Webapps">



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