summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Winkler2010-03-17 11:47:31 (EDT)
committerStefan Winkler2010-03-17 11:47:31 (EDT)
commit153e59fb7ed66598dca80aa86c1e5d9b87d32b43 (patch)
tree95c62f6bde9868a17d50002fc6ea2463a57d7ee2
parent2297a3984fefaa5cf41c69b57586af96c6974ee4 (diff)
downloadcdo-153e59fb7ed66598dca80aa86c1e5d9b87d32b43.zip
cdo-153e59fb7ed66598dca80aa86c1e5d9b87d32b43.tar.gz
cdo-153e59fb7ed66598dca80aa86c1e5d9b87d32b43.tar.bz2
Hotfix: added check of branching support in store and mapping strategy
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java3
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/messages.properties1
2 files changed, 4 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
index 3e3e0af..afe909f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/DBStore.java
@@ -417,6 +417,9 @@ public class DBStore extends LongIDStore implements IDBStore, CDOAllRevisionsPro
checkState(getRevisionTemporality() == RevisionTemporality.AUDITING == mappingStrategy.hasAuditSupport(), Messages
.getString("DBStore.7")); //$NON-NLS-1$
+
+ checkState(getRevisionParallelism() == RevisionParallelism.BRANCHING == mappingStrategy.hasBranchingSupport(),
+ Messages.getString("DBStore.11")); //$NON-NLS-1$
}
@Override
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/messages.properties b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/messages.properties
index da2dba8..3b2f04f 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/messages.properties
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/messages/messages.properties
@@ -15,3 +15,4 @@ DBStore.2=mappingStrategy is null
DBStore.7=AuditSupport of MappingStrategy and Store does not match. Please check configuration.
DBStore.8=First start: {0,date} {0,time}
DBStore.9=Detected crash
+DBStore.11=BranchingSupport of MappingStrategy and Store do not match. Please check configuration.