summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-25 07:25:19 (EDT)
committerEike Stepper2007-09-25 07:25:19 (EDT)
commit25b2f4acc5271e5f2da8b19cba9c90686940adff (patch)
tree6de3c07070fca3df0e5f91f6d1152d04f33401a7
parent73857551942de151cb977966b7f908a8e9c8c42b (diff)
downloadcdo-25b2f4acc5271e5f2da8b19cba9c90686940adff.zip
cdo-25b2f4acc5271e5f2da8b19cba9c90686940adff.tar.gz
cdo-25b2f4acc5271e5f2da8b19cba9c90686940adff.tar.bz2
[204410] CDO test needs Net4j test dependency
https://bugs.eclipse.org/bugs/show_bug.cgi?id=204410
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java14
1 files changed, 12 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
index 541ce5b..6229e0c 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/bundle/OM.java
@@ -19,6 +19,8 @@ import org.eclipse.net4j.util.om.OSGiActivator;
import org.eclipse.net4j.util.om.log.OMLogger;
import org.eclipse.net4j.util.om.trace.OMTracer;
+import java.io.File;
+
/**
* @author Eike Stepper
*/
@@ -48,8 +50,16 @@ public abstract class OM
static void start() throws Exception
{
- RepositoryConfigurator configurator = new RepositoryConfigurator(IPluginContainer.INSTANCE);
- configurator.configure(OMPlatform.INSTANCE.getConfigFile("cdo.server.xml"));
+ File configFile = OMPlatform.INSTANCE.getConfigFile("cdo.server.xml");
+ if (configFile != null && configFile.exists())
+ {
+ RepositoryConfigurator configurator = new RepositoryConfigurator(IPluginContainer.INSTANCE);
+ configurator.configure(configFile);
+ }
+ else
+ {
+ LOG.warn("Repository config file not found: " + configFile.getAbsolutePath());
+ }
}
/**