1 files changed, 9 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java
index 33bcee9932..055bca4d54 100644
--- a/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java
+++ b/plugins/org.eclipse.emf.cdo.common/src/org/eclipse/emf/cdo/internal/common/revision/CDORevisionCacheNonAuditing.java
@@ -67,6 +67,8 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
 
   public InternalCDORevision getRevision(CDOID id, CDOBranchPoint branchPoint)
   {
+    checkBranch(branchPoint.getBranch());
+
     synchronized (revisions)
     {
       Reference<InternalCDORevision> ref = revisions.get(id);
@@ -85,6 +87,8 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
 
   public InternalCDORevision getRevisionByVersion(CDOID id, CDOBranchVersion branchVersion)
   {
+    checkBranch(branchVersion.getBranch());
+
     synchronized (revisions)
     {
       Reference<InternalCDORevision> ref = revisions.get(id);
@@ -145,7 +149,9 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
 
   public List<CDORevision> getRevisions(CDOBranchPoint branchPoint)
   {
+    checkBranch(branchPoint.getBranch());
     List<CDORevision> result = new ArrayList<CDORevision>();
+
     synchronized (revisions)
     {
       for (Reference<InternalCDORevision> ref : revisions.values())
@@ -164,6 +170,8 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
   public void addRevision(CDORevision revision)
   {
     CheckUtil.checkArg(revision, "revision");
+    checkBranch(revision.getBranch());
+
     if (!revision.isHistorical())
     {
       Reference<InternalCDORevision> reference = createReference(revision);
@@ -176,6 +184,7 @@ public class CDORevisionCacheNonAuditing extends AbstractCDORevisionCache
 
   public InternalCDORevision removeRevision(CDOID id, CDOBranchVersion branchVersion)
   {
+    checkBranch(branchVersion.getBranch());
     synchronized (revisions)
     {
       Reference<InternalCDORevision> ref = revisions.get(id);