Author: markt Date: Mon Jan 17 11:26:56 2011 New Revision: 1059881 URL: http://svn.apache.org/viewvc?rev=1059881&view=rev Log: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50600 Prevent ConcurrentModificationException when removing WAR via FarmWarDeployer
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java tomcat/trunk/webapps/docs/changelog.xml Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java?rev=1059881&r1=1059880&r2=1059881&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java (original) +++ tomcat/trunk/java/org/apache/catalina/ha/deploy/WarWatcher.java Mon Jan 17 11:26:56 2011 @@ -96,7 +96,7 @@ public class WarWatcher { } else if (check == -1) { listener.fileRemoved(info.getWar()); //no need to keep in memory - currentStatus.remove(info.getWar().getAbsolutePath()); + i.remove(); } } Modified: tomcat/trunk/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1059881&r1=1059880&r2=1059881&view=diff ============================================================================== --- tomcat/trunk/webapps/docs/changelog.xml (original) +++ tomcat/trunk/webapps/docs/changelog.xml Mon Jan 17 11:26:56 2011 @@ -93,6 +93,10 @@ <add> Internationalise the log messages for the FarmWarDeployer. (markt) </add> + <fix> + <bug>50600</bug>: Prevent a <code>ConcurrentModificationException</code> + when removing a WAR file via the FarmWarDeployer. (markt) + </fix> </changelog> </subsection> <subsection name="Web applications"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org