Merge branch 'moa-id-3.0.0-snapshot' into moa-id-3.2_(OPB)

Conflicts:
	id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java

1 files changed, 6 insertions, 6 deletions

diff --git a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
index 421d00cbe..5312d779c 100644
--- a/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
+++ b/id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
@@ -107,7 +107,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 					samlArtifact, ex.toString() });
 		}
 		Throwable error = null;
-		synchronized (authenticationDataStore) {
+		//synchronized (authenticationDataStore) {
 			try {
 				error = authenticationDataStore
 						.get(samlArtifact, Throwable.class);
@@ -119,7 +119,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 				throw new AuthenticationException("1206", new Object[] { samlArtifact });
 			}
 			
-		}
+		//}
 		
 		return error;
 	}
@@ -178,7 +178,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 					samlArtifact, ex.toString() });
 		}
 		String authData = null;
-		synchronized (authenticationDataStore) {
+		//synchronized (authenticationDataStore) {
 			// System.out.println("assertionHandle: " + assertionHandle);
 						
 			try {
@@ -189,7 +189,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 				Logger.error("Assertion not found for SAML Artifact: " + samlArtifact);
 				throw new AuthenticationException("1206", new Object[] { samlArtifact });
 			}		
-		}
+		//}
 				
 		authenticationDataStore.remove(samlArtifact);
 				
@@ -616,11 +616,11 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 						new Object[] { samlArtifact });
 			parser.parseAssertionHandle();
 			
-			synchronized (authenticationDataStore) {
+			//synchronized (authenticationDataStore) {
 				Logger.debug("Assertion stored for SAML Artifact: "
 						+ samlArtifact);
 				authenticationDataStore.put(samlArtifact, samlAssertion);
-			}
+			//}
 			
 		} catch (AuthenticationException ex) {
 			throw ex;