local merge

Merge branch 'master' of https://gitlab.iaik.tugraz.at/egiz/moa-sig

1 files changed, 8 insertions, 3 deletions

diff --git a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
index 5f3f670..15e44eb 100644
--- a/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
+++ b/moaSig/moa-sig-lib/src/main/java/at/gv/egovernment/moa/spss/server/config/ConfigurationPartsBuilder.java
@@ -763,6 +763,11 @@ public class ConfigurationPartsBuilder {
     while ((keyGroupElem = (Element) kgIter.nextNode()) != null) 
     {
       String keyGroupId = getElementValue(keyGroupElem, CONF + "Id", null);
+
+      //switch all keyGroupIds to lower case, only
+      if (MiscUtil.isNotEmpty(keyGroupId))
+    	  keyGroupId = keyGroupId.trim().toLowerCase();
+      
       String keyGroupDigestMethodAlgorithm = getElementValue(keyGroupElem, CONF + "DigestMethodAlgorithm", null);
       Set keyGroupEntries =
         buildKeyGroupEntries(keyGroupId, keyModuleIds, keyGroupElem);
@@ -888,9 +893,9 @@ public class ConfigurationPartsBuilder {
         keyGroupIter = XPathUtils.selectNodeIterator(mappingElem, CONF + "KeyGroupId");
         while ((keyGroupElem = (Element) keyGroupIter.nextNode()) != null) 
         {
-          String keyGroupId = getElementValue(keyGroupElem, ".", null);
-          KeyGroup keyGroup = (KeyGroup) keyGroups.get(keyGroupId);
-
+        	String keyGroupId = getElementValue(keyGroupElem, ".", null);
+        	KeyGroup keyGroup = (KeyGroup) keyGroups.get(keyGroupId.trim().toLowerCase());
+        	
           if (keyGroup != null) 
           {
             groups.put(keyGroupId, keyGroup);