From 395d0e55c049bb93536f9281c8acfcca552740d5 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 17 Jun 2014 13:34:44 +0200 Subject: if SP errormessage failes then print errormessage to browser --- .../moa/id/entrypoints/DispatcherServlet.java | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'id/server/idserverlib/src/main/java/at/gv/egovernment/moa') diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java index 8e8863cbe..3a5026948 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java @@ -143,24 +143,32 @@ public class DispatcherServlet extends AuthServlet{ //remove MOASession AuthenticationSession moaSession = AuthenticationSessionStoreage.getSessionWithPendingRequestID(pendingRequestID); - AuthenticationManager.getInstance().performOnlyIDPLogOut(req, resp, moaSession.getSessionID()); + if (moaSession != null) + AuthenticationManager.getInstance().performOnlyIDPLogOut(req, resp, moaSession.getSessionID()); return; + + } else { + handleErrorNoRedirect(throwable.getMessage(), throwable, + req, resp); + } } + } catch (Throwable e) { Logger.error(e); handleErrorNoRedirect(throwable.getMessage(), throwable, req, resp); } - } - else { + + } else { handleErrorNoRedirect(throwable.getMessage(), throwable, req, resp); } - } - handleErrorNoRedirect(MOAIDMessageProvider.getInstance().getMessage("auth.26", null), - null, req, resp); + + } else + handleErrorNoRedirect(MOAIDMessageProvider.getInstance().getMessage("auth.26", null), + null, req, resp); return; } -- cgit v1.2.3