Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50600

Prevent ConcurrentModificationException when removing WAR via FarmWarDeployer

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059881 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/ha/deploy/WarWatcher.java b/java/org/apache/catalina/ha/deploy/WarWatcher.java
index 3c63722..b74ffea 100644 (file)
--- a/java/org/apache/catalina/ha/deploy/WarWatcher.java
+++ b/java/org/apache/catalina/ha/deploy/WarWatcher.java
@@ -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();
             }
         }
 

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 423374c..ecde6fe 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">