[258831] Check for Concurrency in CDOStateMachine

https://bugs.eclipse.org/bugs/show_bug.cgi?id=258831

1 files changed, 24 insertions, 11 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
index 0dfe45740a..b30eaeef71 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/transaction/CDOTransactionImpl.java
@@ -82,6 +82,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.Map.Entry;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * @author Eike Stepper
@@ -842,21 +843,33 @@ public class CDOTransactionImpl extends CDOViewImpl implements InternalCDOTransa
         throw new IllegalArgumentException("Savepoint isn't valid : " + savepoint);
       }
 
-      // Rollback objects
-      Set<CDOID> idsOfNewObjectWithDeltas = rollbackCompletely(savepoint);
+      // Use the state lock since rollback mechanism is playing with EObject and CDORevisions. We do not want to
+      // receives notifications during that process! neither the user should callload any objects.
+      ReentrantLock viewLock = getStateLock();
+      viewLock.lock();
 
-      lastSavepoint = (CDOSavepointImpl)savepoint;
-      // Make savepoint active. Erase savepoint that could have be after
-      lastSavepoint.setNextSavepoint(null);
-      lastSavepoint.clear();
+      try
+      {
+        // Rollback objects
+        Set<CDOID> idsOfNewObjectWithDeltas = rollbackCompletely(savepoint);
 
-      // Load from first savepoint up to current savepoint
-      loadSavepoint(lastSavepoint, idsOfNewObjectWithDeltas);
+        lastSavepoint = (CDOSavepointImpl)savepoint;
+        // Make savepoint active. Erase savepoint that could have be after
+        lastSavepoint.setNextSavepoint(null);
+        lastSavepoint.clear();
 
-      if (lastSavepoint == firstSavepoint && options().isAutoReleaseLocksEnabled())
+        // Load from first savepoint up to current savepoint
+        loadSavepoint(lastSavepoint, idsOfNewObjectWithDeltas);
+
+        if (lastSavepoint == firstSavepoint && options().isAutoReleaseLocksEnabled())
+        {
+          // Unlock all objects
+          unlockObjects(null, null);
+        }
+      }
+      finally
       {
-        // Unlock all objects
-        unlockObjects(null, null);
+        viewLock.unlock();
       }
 
       Map<CDOIDTemp, CDOID> idMappings = Collections.emptyMap();