[361819] Double refresh breaks model consistency

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

3 files changed, 116 insertions, 16 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
index 893ee7ea7a..946938b0c0 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java
@@ -413,28 +413,51 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
   {
     if (revision != null)
     {
-      if (revision instanceof PointerCDORevision)
+      acquireAtomicRequestLock(loadAndAddLock);
+
+      try
       {
-        PointerCDORevision pointer = (PointerCDORevision)revision;
-        CDOBranchVersion target = pointer.getTarget();
-        if (target instanceof InternalCDORevision)
+        if (revision instanceof PointerCDORevision)
         {
-          revision = new PointerCDORevision(pointer.getEClass(), pointer.getID(), pointer.getBranch(),
-              pointer.getRevised(), CDOBranchUtil.copyBranchVersion(target));
+          PointerCDORevision pointer = (PointerCDORevision)revision;
+          CDOBranchVersion target = pointer.getTarget();
+          if (target instanceof InternalCDORevision)
+          {
+            revision = new PointerCDORevision(pointer.getEClass(), pointer.getID(), pointer.getBranch(),
+                pointer.getRevised(), CDOBranchUtil.copyBranchVersion(target));
+          }
         }
-      }
-
-      cache.addRevision(revision);
 
-      int oldVersion = revision.getVersion() - 1;
-      if (oldVersion >= CDORevision.UNSPECIFIED_VERSION)
-      {
-        CDOBranchVersion old = revision.getBranch().getVersion(oldVersion);
-        InternalCDORevision oldRevision = getCachedRevisionByVersion(revision.getID(), old);
-        if (oldRevision != null && oldRevision.getRevised() == CDOBranchPoint.UNSPECIFIED_DATE)
+        int oldVersion = revision.getVersion() - 1;
+        if (oldVersion >= CDORevision.UNSPECIFIED_VERSION)
         {
-          oldRevision.setRevised(revision.getTimeStamp() - 1);
+          CDOBranchVersion old = revision.getBranch().getVersion(oldVersion);
+          InternalCDORevision oldRevision = getCachedRevisionByVersion(revision.getID(), old);
+          if (!revision.isHistorical())
+          {
+            if (oldRevision != null)
+            {
+              oldRevision.setRevised(revision.getTimeStamp() - 1);
+            }
+            else
+            {
+              // Remove last revision from cache, which is not revised
+              InternalCDORevision cachedLatestRevision = getCachedRevision(revision.getID(), revision);
+              if (cachedLatestRevision != null && !cachedLatestRevision.isHistorical())
+              {
+                // Found revision is stale.
+                // We cannot revise it now because of lack information, thus remove it from the cache
+                cache.removeRevision(cachedLatestRevision.getID(), cachedLatestRevision);
+              }
+            }
+          }
         }
+
+        cache.addRevision(revision);
+      }
+      finally
+      {
+        releaseAtomicRequestLock(loadAndAddLock);
       }
     }
   }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
index a1dfd475f3..ade3477b36 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllConfigs.java
@@ -245,6 +245,7 @@ public abstract class AllConfigs extends ConfigTestSuite
     testClasses.add(Bugzilla_357441_Test.class);
     testClasses.add(Bugzilla_359669_Test.class);
     testClasses.add(Bugzilla_359992_Test.class);
+    testClasses.add(Bugzilla_361819_Test.class);
     testClasses.add(Bugzilla_363287_Test.class);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java
new file mode 100644
index 0000000000..ce2f7e7a8c
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests.bugzilla;
+
+import org.eclipse.emf.cdo.CDOObject;
+import org.eclipse.emf.cdo.eresource.CDOResource;
+import org.eclipse.emf.cdo.session.CDOSession;
+import org.eclipse.emf.cdo.tests.AbstractCDOTest;
+import org.eclipse.emf.cdo.tests.model1.Category;
+import org.eclipse.emf.cdo.transaction.CDOTransaction;
+import org.eclipse.emf.cdo.util.CDOUtil;
+import org.eclipse.emf.cdo.util.CommitException;
+import org.eclipse.emf.cdo.view.CDOView;
+
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * Bug 361819.
+ * 
+ * @author Egidijus Vaisnora
+ */
+public class Bugzilla_361819_Test extends AbstractCDOTest
+{
+  public void testDoubleRefreshBug() throws Exception
+  {
+    createData(getResourcePath("test"));
+
+    CDOSession session = openSession();
+    session.options().setPassiveUpdateEnabled(false);
+    CDOView view = session.openView();
+    CDOResource resource = view.getResource(getResourcePath("test"));
+    EObject testingEObject = resource.getContents().get(0);
+    CDOObject testingObject = CDOUtil.getCDOObject(testingEObject);
+
+    CDOSession session2 = openSession();
+    CDOTransaction transaction = session2.openTransaction();
+    CDOResource resource2 = transaction.getResource(getResourcePath("test"));
+
+    Category category = (Category)resource2.getContents().get(0);
+    category.setName("v2");
+    transaction.commit();
+
+    category.setName("v3");
+    transaction.commit();
+    assertEquals(3, CDOUtil.getCDOObject(category).cdoRevision().getVersion());
+
+    assertClean(testingObject, testingObject.cdoView());
+    session.refresh();
+    session.refresh();
+    assertProxy(testingObject);
+
+    // Load proxy
+    ((Category)testingEObject).getName();
+
+    // Version of object should be 3
+    assertEquals(3, testingObject.cdoRevision().getVersion());
+  }
+
+  private void createData(String resourcePath) throws CommitException
+  {
+    CDOSession session = openSession();
+    CDOTransaction transaction = session.openTransaction();
+    CDOResource resource = transaction.createResource(resourcePath);
+    resource.getContents().add(getModel1Factory().createCategory());
+    transaction.commit();
+    session.close();
+  }
+}