[366066] Double refresh breaks model consistency

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

2 files changed, 77 insertions, 1 deletions

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..595772f4a1
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_361819_Test.java
@@ -0,0 +1,77 @@
+/*
+ * 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
+  {
+    skipLegacy();
+    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();
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index d01995faeb..70b4bd66b9 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -699,7 +699,6 @@ public abstract class AbstractCDOView extends Lifecycle implements InternalCDOVi
 
         throw new ObjectNotFoundException(id, this);
       }
-
     }
     else
     {