From e5dc7e35cdddee53ef8d9c634444145e923a721c Mon Sep 17 00:00:00 2001
From: gakin <gakin>
Date: Mon, 26 Sep 2016 10:54:12 +0000
Subject: [PATCH] SSDM-4141 : Fix NPE in ConfigReader
SVN: 37110
---
.../openbis/generic/server/dss/plugins/ConfigReader.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java
index aeb2f70497b..e291b4e5bf2 100644
--- a/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java
+++ b/datastore_server/source/java/ch/ethz/sis/openbis/generic/server/dss/plugins/ConfigReader.java
@@ -152,8 +152,12 @@ public class ConfigReader
{
throw new ConfigurationFailureException("Section '" + section + " does not exist.");
}
- String val = map.get(key).trim();
- if (val.equals("") == true)
+ String val = map.get(key);
+ if (val == null)
+ {
+ return null;
+ }
+ if (val.trim().equals("") == true)
{
return null;
}
--
GitLab