aboutsummaryrefslogtreecommitdiff
path: root/id
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-03-22 08:49:17 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-03-22 08:49:17 +0100
commit9b980ba714e6d59abcccb10df5036c0c318721c5 (patch)
tree41bdb6768381c7690c0ce46ee0154476d6c9cae5 /id
parent836a7cf93aca1a84f2827f78e849e012a1a368a3 (diff)
downloadmoa-id-spss-9b980ba714e6d59abcccb10df5036c0c318721c5.tar.gz
moa-id-spss-9b980ba714e6d59abcccb10df5036c0c318721c5.tar.bz2
moa-id-spss-9b980ba714e6d59abcccb10df5036c0c318721c5.zip
fix nullpointer during IDP initiated Single LogOut
Diffstat (limited to 'id')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index e5c517da7..1e064f24f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -469,9 +469,19 @@ public class AuthenticationManager extends MOAIDAuthConstants {
//terminate MOASession
try {
+ String uniqueSessionIdentifier = "notSet";
+ AuthenticationSessionExtensions sessionExt =
+ authenticatedSessionStore.getAuthenticationSessionExtensions(session.getSessionID());
+ if (sessionExt != null)
+ uniqueSessionIdentifier = sessionExt.getUniqueSessionId();
+
authenticatedSessionStore.destroySession(session.getSessionID());
ssoManager.deleteSSOSessionID(httpReq, httpResp);
- revisionsLogger.logEvent(MOAIDEventConstants.SESSION_DESTROYED, pvpReq.getUniqueSessionIdentifier());
+ if (pvpReq != null)
+ revisionsLogger.logEvent(MOAIDEventConstants.SESSION_DESTROYED, pvpReq.getUniqueSessionIdentifier());
+ else
+ revisionsLogger.logEvent(MOAIDEventConstants.SESSION_DESTROYED, uniqueSessionIdentifier);
+
Logger.debug("Active SSO Session on IDP is remove.");
} catch (MOADatabaseException e) {