aboutsummaryrefslogtreecommitdiff
path: root/id/server/modules/moa-id-modules-saml1/src
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-02-10 13:13:48 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-02-10 13:13:48 +0100
commit8b29eb9a19c4dcf6e30e34e41b8c6db61a21adb6 (patch)
tree782b07c818bffa60068a3409477f198d953aaf39 /id/server/modules/moa-id-modules-saml1/src
parent3f752412b85561e4207cd6fd7c2872da68e5133f (diff)
parentd1a26145ba00478249a8f006d74be49f857b1f34 (diff)
downloadmoa-id-spss-8b29eb9a19c4dcf6e30e34e41b8c6db61a21adb6.tar.gz
moa-id-spss-8b29eb9a19c4dcf6e30e34e41b8c6db61a21adb6.tar.bz2
moa-id-spss-8b29eb9a19c4dcf6e30e34e41b8c6db61a21adb6.zip
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
Diffstat (limited to 'id/server/modules/moa-id-modules-saml1/src')
-rw-r--r--id/server/modules/moa-id-modules-saml1/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java12
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;