Removed confusing return value from CDORevisionCache.addRevision()

3 files changed, 16 insertions, 13 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 f0e8a1fb70..60bd33ffcf 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
@@ -395,24 +395,24 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi
       }
 
       boolean added = cache.addRevision(revision);
-      if (added)
+      if (!added)
       {
-        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.setRevised(revision.getTimeStamp() - 1);
-          }
+        return false;
+      }
 
-          return true;
+      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.setRevised(revision.getTimeStamp() - 1);
         }
       }
     }
 
-    return false;
+    return true;
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/noop/NOOPRevisionCache.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/noop/NOOPRevisionCache.java
index ca3f69f420..a254b43dda 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/noop/NOOPRevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/cache/noop/NOOPRevisionCache.java
@@ -78,7 +78,7 @@ public class NOOPRevisionCache extends Lifecycle implements InternalCDORevisionC
   public boolean addRevision(CDORevision revision)
   {
     CheckUtil.checkArg(revision, "revision");
-    return false;
+    return true;
   }
 
   public InternalCDORevision removeRevision(CDOID id, CDOBranchVersion branchVersion)
diff --git a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
index e8f3ec1538..44b040783c 100644
--- a/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
+++ b/plugins/org.eclipse.emf.cdo.workspace/src/org/eclipse/emf/cdo/internal/workspace/CDOWorkspaceImpl.java
@@ -21,6 +21,8 @@ import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionHandler;
 import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
 import org.eclipse.emf.cdo.common.revision.CDORevisionProvider;
+import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
+import org.eclipse.emf.cdo.common.revision.cache.CDORevisionCache;
 import org.eclipse.emf.cdo.common.revision.delta.CDORevisionDeltaUtil;
 import org.eclipse.emf.cdo.internal.server.Repository;
 import org.eclipse.emf.cdo.net4j.CDONet4jUtil;
@@ -478,6 +480,7 @@ public class CDOWorkspaceImpl implements InternalCDOWorkspace
     org.eclipse.emf.cdo.net4j.CDOSessionConfiguration configuration = CDONet4jUtil.createSessionConfiguration();
     configuration.setConnector(connector);
     configuration.setRepositoryName(repositoryName);
+    configuration.setRevisionManager(CDORevisionUtil.createRevisionManager(CDORevisionCache.NOOP)); // Use repo's cache
     return (InternalCDOSession)configuration.openSession();
   }