diff options
author | Eike Stepper | 2010-10-16 10:41:05 +0000 |
---|---|---|
committer | Eike Stepper | 2010-10-16 10:41:05 +0000 |
commit | 6ac1de8ce44dc3d638346d002fb6a799f95e3070 (patch) | |
tree | a1850616dbf1e9c5d34af89570a21262c8001287 | |
parent | b5656dfacf0c66030c4207b8d93d7e814de0b71f (diff) | |
download | cdo-6ac1de8ce44dc3d638346d002fb6a799f95e3070.tar.gz cdo-6ac1de8ce44dc3d638346d002fb6a799f95e3070.tar.xz cdo-6ac1de8ce44dc3d638346d002fb6a799f95e3070.zip |
[327405] Provide an offline CDOWorkspace with Checkout/Update/Commit workflows
https://bugs.eclipse.org/bugs/show_bug.cgi?id=327405
-rw-r--r-- | plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStore.java | 9 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java | 1 |
2 files changed, 9 insertions, 1 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 4cc9b6ce00..1113b0e8cc 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 @@ -899,7 +899,14 @@ public class MEMStore extends LongIDStore implements IMEMStore, BranchLoader InternalCDORevision oldRevision = getRevisionByVersion(list, oldVersion); if (oldRevision != null) { - oldRevision.setRevised(revision.getTimeStamp() - 1); + if (getRepository().isSupportingAudits()) + { + oldRevision.setRevised(revision.getTimeStamp() - 1); + } + else + { + list.remove(oldRevision); + } } } diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java index 79b3b192c7..a08d7f7c73 100644 --- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java +++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java @@ -95,6 +95,7 @@ public class WorkspaceTest extends AbstractCDOTest @Override protected void doSetUp() throws Exception { + skipUnlessAuditing(); disableConsole(); super.doSetUp(); |