3 files changed, 34 insertions, 5 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPSessionUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPSessionUtils.java
index a8eef06a7..896fc6d5d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPSessionUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/HTTPSessionUtils.java
@@ -1,9 +1,38 @@
 package at.gv.egovernment.moa.id.util;
 
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Set;
+
 import javax.servlet.http.HttpSession;
 
 public class HTTPSessionUtils {
 
+	public static HashMap<String, Object> extractAllProperties(HttpSession session) {
+		@SuppressWarnings("unchecked")
+		Enumeration<String> keys = (Enumeration<String>)session.getAttributeNames();
+		HashMap<String, Object> properties = new HashMap<String, Object>();
+		
+		while(keys.hasMoreElements()) {
+			Object keyObject = keys.nextElement();
+			String key = keyObject.toString();
+			Object value = session.getAttribute(key);
+			properties.put(key, value);
+		}
+		
+		return properties;
+	}
+	
+	public static void pushAllProperties(HttpSession session, HashMap<String, Object> properties) {
+		Set<String> keys = properties.keySet();
+		Iterator<String> keysIterator = keys.iterator();
+		while(keysIterator.hasNext()) {
+			String key = keysIterator.next();
+			session.setAttribute(key, properties.get(key));
+		}
+	}
+	
 	public static boolean getHTTPSessionBoolean(HttpSession session, String name, boolean fallback) {
 		Object obj = session.getAttribute(name);
 		if(obj == null) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
index a0add1054..705b4e881 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/SSLUtils.java
@@ -79,7 +79,7 @@ public class SSLUtils {
    */
   public static void initialize() {
     sslSocketFactories = new HashMap();
-    // JSSE Abhängigkeit
+    // JSSE Abhängigkeit
     //Security.addProvider(new com.sun.net.ssl.internal.ssl.Provider());
     Security.addProvider(new IAIK());
     //System.setProperty("java.protocol.handler.pkgs", "com.sun.net.ssl.internal.www.protocol");
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
index d97953270..1f5f1ea20 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISMandate.java
@@ -27,13 +27,13 @@ package at.gv.egovernment.moa.id.util.client.mis.simple;
 public class MISMandate {

 

 	final static private String OID_NOTAR = "1.2.40.0.10.3.1";

-	final static private String TEXT_NOTAR = "berufsmäßige(r) Parteienvertreter(in) mit Notariatseigenschaft";

+	final static private String TEXT_NOTAR = "berufsmäßige(r) Parteienvertreter(in) mit Notariatseigenschaft";

 	

 	final static private String OID_RECHTSANWALT = "1.2.40.0.10.3.2";

-	final static private String TEXT_RECHTSANWALT = "berufsmäßige(r) Parteienvertreter(in) mit Rechtsanwaltseigenschaft";

+	final static private String TEXT_RECHTSANWALT = "berufsmäßige(r) Parteienvertreter(in) mit Rechtsanwaltseigenschaft";

 	

 	final static private String OID_ZIVILTECHNIKER = "1.2.40.0.10.3.3";

-	final static private String TEXT_ZIVILTECHNIKER = "berufsmäßige(r) Parteienvertreter(in) mit Ziviltechnikerinneneigenschaft";

+	final static private String TEXT_ZIVILTECHNIKER = "berufsmäßige(r) Parteienvertreter(in) mit Ziviltechnikerinneneigenschaft";

 

 	final static public String OID_ORGANWALTER = "1.2.40.0.10.3.4";

 	final static private String TEXT_ORGANWALTER = "Organwalter";

@@ -73,7 +73,7 @@ public class MISMandate {
 		if (this.oid.equalsIgnoreCase(OID_ORGANWALTER))

 			return TEXT_ORGANWALTER;

 		

-		return "Keine textuelle Beschreibung für OID " + oid;

+		return "Keine textuelle Beschreibung für OID " + oid;

 		

 	}