2 files changed, 8 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
index 6423a50436..0dac57f884 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/Commits.java
@@ -438,6 +438,7 @@ public class Commits extends Coll
     final CDOID folderID = context.getFolderID();
     final String name = context.getName();
     final boolean exactMatch = context.exactMatch();
+    final long timeStamp = context.getTimeStamp();
 
     DBObject query = new BasicDBObject();
 
@@ -470,6 +471,11 @@ public class Commits extends Coll
           return null;
         }
 
+        if (classID != folderCID && classID != resourceCID)
+        {
+          return null;
+        }
+
         int version = (Integer)embedded.get(REVISIONS_VERSION);
         if (version <= 0)
         {
@@ -515,7 +521,7 @@ public class Commits extends Coll
 
         CDOID id = idHandler.read(embedded, REVISIONS_ID);
         long revised = getRevised(id, context.getBranch(), version, doc, embedded);
-        if (revised != CDOBranchPoint.UNSPECIFIED_DATE)
+        if (revised != CDOBranchPoint.UNSPECIFIED_DATE && revised < timeStamp)
         {
           return null;
         }
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
index c0b7ab33a3..06f50afcb2 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/mem/MEMStoreAccessor.java
@@ -229,7 +229,7 @@ public class MEMStoreAccessor extends LongIDStoreAccessor implements IStoreAcces
     MEMStore store = getStore();
     synchronized (store)
     {
-      super.write(context, monitor);
+      super.doWrite(context, monitor);
     }
   }