summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-26 01:30:53 (EDT)
committerEike Stepper2007-08-26 01:30:53 (EDT)
commit428e6171ba22710dbf6aa51d97b3f007b30d124a (patch)
tree50200707cefe56ccdb18e23b1dd0745f2e601181
parent64fbe42aeec1544d701cc58de9b911be75dac7fb (diff)
downloadcdo-428e6171ba22710dbf6aa51d97b3f007b30d124a.zip
cdo-428e6171ba22710dbf6aa51d97b3f007b30d124a.tar.gz
cdo-428e6171ba22710dbf6aa51d97b3f007b30d124a.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java5
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java11
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java3
3 files changed, 17 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
index c0f34f4..0c32fa8 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStoreAccessor.java
@@ -452,6 +452,11 @@ public class DBStoreAccessor implements IDBStoreAccessor
throw new UnsupportedOperationException("Not yet implemented");
}
+ public CDORevisionImpl verifyRevision(CDORevisionImpl revision)
+ {
+ return revision;
+ }
+
/**
* TODO Move this somehow to DBAdapter
*/
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
index acf5dc1..9c1508b 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/RevisionManager.java
@@ -47,9 +47,16 @@ public class RevisionManager extends CDORevisionResolverImpl implements IRevisio
}
@Override
- protected void verifyRevision(CDORevisionImpl revision)
+ protected CDORevisionImpl verifyRevision(CDORevisionImpl revision)
{
- super.verifyRevision(revision);
+ revision = super.verifyRevision(revision);
+ if (repository.isVerifyingRevisions())
+ {
+ IStoreReader storeReader = StoreUtil.getReader();
+ revision = storeReader.verifyRevision(revision);
+ }
+
+ return revision;
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java
index e9c1d55..d81a5c6 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/server/IStoreReader.java
@@ -11,6 +11,7 @@
package org.eclipse.emf.cdo.server;
import org.eclipse.emf.cdo.internal.protocol.model.CDOPackageImpl;
+import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.internal.server.StoreUtil;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.model.CDOClassRef;
@@ -58,4 +59,6 @@ public interface IStoreReader extends IStoreAccessor
public CDOID readResourceID(String path);
public String readResourcePath(CDOID id);
+
+ public CDORevisionImpl verifyRevision(CDORevisionImpl revision);
}