fix possible bottleneck in case of high load and a low number of allowed database connections

1 files changed, 8 insertions, 9 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 eb869756e..04e50baac 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
@@ -38,9 +38,6 @@ import org.apache.commons.lang3.StringEscapeUtils;
 import org.w3c.dom.Element;
 import org.xml.sax.SAXException;
 
-import eu.stork.peps.auth.commons.IPersonalAttributeList;
-import eu.stork.peps.auth.commons.PersonalAttribute;
-
 import at.gv.egovernment.moa.id.auth.AuthenticationServer;
 import at.gv.egovernment.moa.id.auth.builder.AuthenticationDataAssertionBuilder;
 import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
@@ -77,6 +74,8 @@ import at.gv.util.xsd.persondata.IdentificationType.Value;
 import at.gv.util.xsd.persondata.PersonNameType;
 import at.gv.util.xsd.persondata.PersonNameType.FamilyName;
 import at.gv.util.xsd.persondata.PhysicalPersonType;
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttribute;
 
 public class SAML1AuthenticationServer extends AuthenticationServer {
 	
@@ -108,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);
@@ -120,7 +119,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 				throw new AuthenticationException("1206", new Object[] { samlArtifact });
 			}
 			
-		}
+		//}
 		
 		return error;
 	}
@@ -179,7 +178,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 					samlArtifact, ex.toString() });
 		}
 		String authData = null;
-		synchronized (authenticationDataStore) {
+		//synchronized (authenticationDataStore) {
 			// System.out.println("assertionHandle: " + assertionHandle);
 						
 			try {
@@ -190,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);
 				
@@ -617,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;