From d88bc08b211a15094f679e4583f324d9e86a44e5 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 31 Jul 2010 11:04:45 +0000
Subject: [PATCH] fix: a non-existing store root needs to throw a
ConfigurationFailureException, not an AssertionError
SVN: 17306
---
.../server/plugins/standard/AbstractDatastorePlugin.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java
index 34d28450529..126242cbd23 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/AbstractDatastorePlugin.java
@@ -23,6 +23,7 @@ import java.util.Properties;
import org.apache.commons.lang.StringUtils;
+import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.openbis.generic.shared.dto.DatasetDescription;
@@ -43,7 +44,11 @@ public abstract class AbstractDatastorePlugin implements Serializable
protected AbstractDatastorePlugin(Properties properties, File storeRoot)
{
- assert storeRoot.exists() : "storeRoot does not exist " + storeRoot;
+ if (storeRoot.exists() == false)
+ {
+ throw ConfigurationFailureException.fromTemplate("Store root '%s' does not exist.",
+ storeRoot);
+ }
this.storeRoot = storeRoot;
this.properties = properties;
--
GitLab