From be9933b6920c5b4cc97de467a9f8746191bcb3ee Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 5 Mar 2012 14:53:49 +0000
Subject: [PATCH] LMS-2818 Do not subpress config exception
SVN: 24615
---
.../cisd/openbis/dss/generic/server/DataStoreServer.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index cd5b091b0ed..2099113c27a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -420,14 +420,7 @@ public class DataStoreServer
{
if (configParameters == null)
{
- Properties properties;
- try
- {
- properties = DssPropertyParametersUtil.loadServiceProperties();
- } catch (ConfigurationFailureException ex)
- {
- properties = new Properties();
- }
+ Properties properties = DssPropertyParametersUtil.loadServiceProperties();
final Properties systemProperties = System.getProperties();
final Enumeration<?> propertyNames = systemProperties.propertyNames();
while (propertyNames.hasMoreElements())
--
GitLab