Merge remote-tracking branch 'remotes/origin/moapid-3.2-opb-redis' into eIDAS_node_implementation

Conflicts:
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/SingleLogOutAction.java

1 files changed, 12 insertions, 1 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java
index 5a5f4edac..260b2ecb1 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/util/Constants.java
@@ -24,7 +24,10 @@
 
 package at.gv.egovernment.moa.util;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
+
 
 /**
  * Contains various constants used throughout the system.
@@ -509,6 +512,14 @@ public interface Constants {
   /** 
    * A map used to map namespace prefixes to namespace URIs 
    */ 
-  public static HashMap<String, String> nSMap = new HashMap<String, String>(5);
+  public static final Map<String, String> nSMap = Collections.unmodifiableMap(new HashMap<String, String>(){
+	private static final long serialVersionUID = 3845384324295136490L;
+	  {
+	  put(Constants.SAML_PREFIX, Constants.SAML_NS_URI);
+	  put(Constants.ECDSA_PREFIX, "http://www.w3.org/2001/04/xmldsig-more#");
+	  put(Constants.DSIG_PREFIX, Constants.DSIG_NS_URI);
+  	}
+  });
+
    
 }