diff options
author | Eike Stepper | 2016-12-14 08:06:34 +0000 |
---|---|---|
committer | Eike Stepper | 2016-12-14 08:06:34 +0000 |
commit | e06ec8c3a7c6a8cfa334752f3435264d5dc6dd7c (patch) | |
tree | 7a87ada54a771b2207bbe48b8a5a8d71502305e8 /plugins/org.eclipse.emf.cdo.common | |
parent | 5986b206d25da8e5d040cc042cba11fa1581b272 (diff) | |
download | cdo-e06ec8c3a7c6a8cfa334752f3435264d5dc6dd7c.tar.gz cdo-e06ec8c3a7c6a8cfa334752f3435264d5dc6dd7c.tar.xz cdo-e06ec8c3a7c6a8cfa334752f3435264d5dc6dd7c.zip |
[509149] Provide an EmbeddedRepository
https://bugs.eclipse.org/bugs/show_bug.cgi?id=509149
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.common')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionManagerImpl.java | 8 |
1 files changed, 5 insertions, 3 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 4323d1871d..71cc783d5d 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 @@ -473,8 +473,10 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi int oldVersion = revision.getVersion() - 1; if (oldVersion >= CDORevision.UNSPECIFIED_VERSION) { + CDOID id = revision.getID(); CDOBranchVersion old = revision.getBranch().getVersion(oldVersion); - InternalCDORevision oldRevision = getCachedRevisionByVersion(revision.getID(), old); + + InternalCDORevision oldRevision = getCachedRevisionByVersion(id, old); if (!revision.isHistorical()) { if (oldRevision != null) @@ -484,12 +486,12 @@ public class CDORevisionManagerImpl extends Lifecycle implements InternalCDORevi else { // Remove last revision from cache, which is not revised - InternalCDORevision cachedLatestRevision = getCachedRevision(revision.getID(), revision); + InternalCDORevision cachedLatestRevision = getCachedRevision(id, 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.removeRevision(id, cachedLatestRevision); } } } |