Author: rjung
Date: Mon Jan 31 20:15:09 2011
New Revision: 1065741
URL: http://svn.apache.org/viewvc?rev=1065741&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50600
Avoid ConcurrentModificationException when removing WAR via FarmWarDeployer
Backport of r1059881 from trunk, resp. r1060465 from TC6.
Modified:
tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
Modified: tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml?rev=1065741&r1=1065740&r2=1065741&view=diff
==============================================================================
--- tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml (original)
+++ tomcat/sandbox/tomcat-oacc/trunk/docs/changelog.xml Mon Jan 31 20:15:09 2011
@@ -32,6 +32,10 @@
<section name="Tomcat OACC 0.1 (rjung)">
<subsection name="Cluster">
<fix>
+ <bug>50600</bug>: Prevent a
<code>ConcurrentModificationException</code>
+ when removing a WAR file via the FarmWarDeployer. (rjung)
+ </fix>
+ <fix>
Avoid a NPE in the DeltaManager when a parallel request invalidates the
session before the current request has a chance to send the replication
message. (rjung)
Modified:
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java?rev=1065741&r1=1065740&r2=1065741&view=diff
==============================================================================
---
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
(original)
+++
tomcat/sandbox/tomcat-oacc/trunk/src/share/org/apache/catalina/cluster/deploy/WarWatcher.java
Mon Jan 31 20:15:09 2011
@@ -93,7 +93,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();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
