diff options
| author | Eike Stepper | 2011-03-02 06:04:12 +0000 |
|---|---|---|
| committer | Eike Stepper | 2011-03-02 06:04:12 +0000 |
| commit | dd48eb0839e48f3759fc0e11d5e85ed51d2faf60 (patch) | |
| tree | b3956c881022efcad5f08d19243af2e4334b54db /plugins/org.eclipse.emf.cdo.server.objectivity | |
| parent | c85966659be299aea06fa40319acaf75658fe3d3 (diff) | |
| download | cdo-dd48eb0839e48f3759fc0e11d5e85ed51d2faf60.tar.gz cdo-dd48eb0839e48f3759fc0e11d5e85ed51d2faf60.tar.xz cdo-dd48eb0839e48f3759fc0e11d5e85ed51d2faf60.zip | |
[337805] Repo config logic broken when supportingAudits/Branches props missing
https://bugs.eclipse.org/bugs/show_bug.cgi?id=337805
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.objectivity')
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java index ec23b30d16..60d9c02e6f 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreFactory.java @@ -13,10 +13,11 @@ package org.eclipse.emf.cdo.server.internal.objectivity; import org.eclipse.emf.cdo.server.IStore; import org.eclipse.emf.cdo.server.IStoreFactory; -import org.eclipse.emf.cdo.spi.server.InternalRepository; import org.w3c.dom.Element; +import java.util.Map; + public class ObjectivityStoreFactory implements IStoreFactory { @@ -24,7 +25,7 @@ public class ObjectivityStoreFactory implements IStoreFactory { } - public IStore createStore(InternalRepository repository, Element storeConfig) + public IStore createStore(String repositoryName, Map<String, String> repositoryProperties, Element storeConfig) { // System.out.println(">>> OSF.createStore()"); // TODO - we might want to initialize Objy with the diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java index 20bdce7e0c..c198bdeea7 100644 --- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java +++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObjectManager.java @@ -139,8 +139,7 @@ public class ObjyObjectManager } /** - * return an ObjyObject based on the id passed. usually this is used for existing object when trying to modify - * them. + * return an ObjyObject based on the id passed. usually this is used for existing object when trying to modify them. */ public ObjyObject getObject(CDOID id) { |