Merge branch 'master' into moa-sig-dependency-fixup

1 files changed, 20 insertions, 8 deletions

diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
index af009b10..55662326 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/conf/AbstractConfigurationImpl.java
@@ -158,19 +158,31 @@ public abstract class AbstractConfigurationImpl implements IExtendedConfiguratio
 		return defaultValue;
 	}
 
+	
 	@Override
-	public Map<String, String> getBasicMOAIDConfigurationWithPrefix(String prefix) {
-		return KeyValueUtils.getSubSetWithPrefix(KeyValueUtils.convertPropertiesToMap(properties), addPrefixToKey(prefix));
+	public Boolean getBasicConfigurationBoolean(String key) {
+		final String value = getBasicConfiguration(key);
+		if (value != null)
+			return Boolean.parseBoolean(value);
+		else
+			return null;
 		
 	}
 
+
 	@Override
-	public boolean getBasicMOAIDConfigurationBoolean(String key, boolean defaultValue) {
-		final String value = getBasicConfiguration(key);		
-		if (StringUtils.isNotEmpty(value))
-			return Boolean.valueOf(value.trim());
-						
-		return defaultValue;
+	public boolean getBasicConfigurationBoolean(String key, boolean defaultValue) {
+		final Boolean result = getBasicConfigurationBoolean(key);
+		if (result != null)
+			return result;
+		else
+			return defaultValue;
+		
+	}
+	
+	@Override
+	public Map<String, String> getBasicConfigurationWithPrefix(String prefix) {
+		return KeyValueUtils.getSubSetWithPrefix(KeyValueUtils.convertPropertiesToMap(properties), addPrefixToKey(prefix));
 		
 	}