[256936] Support for Offline Modecommitters/estepper/commit-notification

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

4 files changed, 82 insertions, 15 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
index 1c80d315b4..2bd41536ce 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java
@@ -186,19 +186,14 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader
 
   public synchronized InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion)
   {
-    if (getRepository().isSupportingAudits())
+    Object listKey = getListKey(id, branchVersion.getBranch());
+    List<InternalCDORevision> list = revisions.get(listKey);
+    if (list == null)
     {
-      Object listKey = getListKey(id, branchVersion.getBranch());
-      List<InternalCDORevision> list = revisions.get(listKey);
-      if (list != null)
-      {
-        return getRevisionByVersion(list, branchVersion.getVersion());
-      }
-
       return null;
     }
 
-    throw new UnsupportedOperationException();
+    return getRevisionByVersion(list, branchVersion.getVersion());
   }
 
   /**
@@ -210,12 +205,12 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader
     if (branchPoint.getTimeStamp() == CDORevision.UNSPECIFIED_DATE)
     {
       List<InternalCDORevision> list = revisions.get(listKey);
-      if (list != null)
+      if (list == null)
       {
-        return list.get(list.size() - 1);
+        return null;
       }
 
-      return null;
+      return list.get(list.size() - 1);
     }
 
     if (!getRepository().isSupportingAudits())
@@ -224,12 +219,12 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader
     }
 
     List<InternalCDORevision> list = revisions.get(listKey);
-    if (list != null)
+    if (list == null)
     {
-      return getRevision(list, branchPoint);
+      return null;
     }
 
-    return null;
+    return getRevision(list, branchPoint);
   }
 
   public synchronized void addRevision(InternalCDORevision revision)
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
index d637b6bb87..d3251d2438 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTests.java
@@ -27,5 +27,7 @@ public class AllTests extends AllTestsAllConfigs
   protected void initConfigSuites(TestSuite parent)
   {
     addScenario(parent, COMBINED, MEM, JVM, NATIVE);
+    addScenario(parent, COMBINED, MEM_AUDITS, JVM, NATIVE);
+    addScenario(parent, COMBINED, MEM_BRANCHES, JVM, NATIVE);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
index 52ca735dca..5e7a37d206 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/IConstants.java
@@ -26,6 +26,10 @@ public interface IConstants
 
   public static final RepositoryConfig.MEM MEM = RepositoryConfig.MEM.INSTANCE;
 
+  public static final RepositoryConfig.MEMAudits MEM_AUDITS = RepositoryConfig.MEMAudits.INSTANCE;
+
+  public static final RepositoryConfig.MEMBranches MEM_BRANCHES = RepositoryConfig.MEMBranches.INSTANCE;
+
   public static final RepositoryConfig.MEMOffline MEM_OFFLINE = RepositoryConfig.MEMOffline.INSTANCE;
 
   public static final SessionConfig EMBEDDED = SessionConfig.Embedded.INSTANCE;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index f99001b25a..9899eb8d82 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -215,6 +215,72 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
     {
       return MEMStoreUtil.createMEMStore();
     }
+
+    @Override
+    protected void initRepositoryProperties(Map<String, String> props)
+    {
+      super.initRepositoryProperties(props);
+      props.put(Props.SUPPORTING_AUDITS, "false");
+      props.put(Props.SUPPORTING_BRANCHES, "false");
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  public static class MEMAudits extends RepositoryConfig
+  {
+    public static final MEMAudits INSTANCE = new MEMAudits();
+
+    private static final long serialVersionUID = 1L;
+
+    public MEMAudits()
+    {
+      super("MEMAudits");
+    }
+
+    @Override
+    protected IStore createStore(String repoName)
+    {
+      return MEMStoreUtil.createMEMStore();
+    }
+
+    @Override
+    protected void initRepositoryProperties(Map<String, String> props)
+    {
+      super.initRepositoryProperties(props);
+      props.put(Props.SUPPORTING_AUDITS, "true");
+      props.put(Props.SUPPORTING_BRANCHES, "false");
+    }
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  public static class MEMBranches extends RepositoryConfig
+  {
+    public static final MEMBranches INSTANCE = new MEMBranches();
+
+    private static final long serialVersionUID = 1L;
+
+    public MEMBranches()
+    {
+      super("MEMBranches");
+    }
+
+    @Override
+    protected IStore createStore(String repoName)
+    {
+      return MEMStoreUtil.createMEMStore();
+    }
+
+    @Override
+    protected void initRepositoryProperties(Map<String, String> props)
+    {
+      super.initRepositoryProperties(props);
+      props.put(Props.SUPPORTING_AUDITS, "true");
+      props.put(Props.SUPPORTING_BRANCHES, "true");
+    }
   }
 
   /**