342910 synchronize access to context pomFiles

Currently, when workspace autobuild is on (the default), both Maven Builder
and background refresh job will resolve dependencies concurrently, which
may result in repository system callbacks coming from two threads, which may
lead to concurrent modification exceptions.

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/DependencyResolutionContext.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/DependencyResolutionContext.java
index 71031ae3..54860fd5 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/DependencyResolutionContext.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/project/DependencyResolutionContext.java
@@ -45,11 +45,11 @@ public class DependencyResolutionContext {
     this.executionRequest = executionRequest;
   }
 
-  public boolean isEmpty() {
+  public synchronized boolean isEmpty() {
     return pomFiles.isEmpty();
   }
 
-  public void forcePomFiles(Set<IFile> pomFiles) {
+  public synchronized void forcePomFiles(Set<IFile> pomFiles) {
     this.pomFiles.addAll(pomFiles);
     this.forcedPomFiles.addAll(pomFiles);
   }
@@ -66,7 +66,7 @@ public class DependencyResolutionContext {
     return request.isForce() || forcedPomFiles.contains(pom);
   }
 
-  public IFile pop() {
+  public synchronized IFile pop() {
     Iterator<IFile> i = pomFiles.iterator();
     IFile pom = i.next();
     i.remove();