Bug 74104 Concurrent Modification Exception in new code

1 files changed, 6 insertions, 1 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetManager.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetManager.java
index ed54b1e5a..44f78e673 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetManager.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/CommitSetManager.java
@@ -235,16 +235,21 @@ public class CommitSetManager extends Object implements IResourceChangeListener,
      * @see org.eclipse.team.internal.ccvs.core.IResourceStateChangeListener#resourceSyncInfoChanged(org.eclipse.core.resources.IResource[])
      */
     public void resourceSyncInfoChanged(IResource[] changedResources) {
+        List toRemove = new ArrayList();
         for (Iterator iter = activeSets.iterator(); iter.hasNext();) {
             CommitSet set = (CommitSet) iter.next();
             if (!set.isEmpty()) {
                 // Don't forward the event if the set is empty
 	            set.resourceSyncInfoChanged(changedResources);
 	            if (set.isEmpty()) {
-	                remove(set);
+	                toRemove.add(set);
 	            }
             }
         }
+        for (Iterator iter = toRemove.iterator(); iter.hasNext();) {
+            CommitSet set = (CommitSet) iter.next();
+            remove(set);
+        }
     }
 
     /* (non-Javadoc)