aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib/src/main/java
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2014-06-17 13:34:44 +0200
committerThomas Lenz <tlenz@iaik.tugraz.at>2014-06-17 13:34:44 +0200
commit395d0e55c049bb93536f9281c8acfcca552740d5 (patch)
tree185165c1e0137d59f3284d9bb9c81b0d16941870 /id/server/idserverlib/src/main/java
parent93365112d12462f9c4a79b5c8c29da890216d57f (diff)
downloadmoa-id-spss-395d0e55c049bb93536f9281c8acfcca552740d5.tar.gz
moa-id-spss-395d0e55c049bb93536f9281c8acfcca552740d5.tar.bz2
moa-id-spss-395d0e55c049bb93536f9281c8acfcca552740d5.zip
if SP errormessage failes then print errormessage to browser
Diffstat (limited to 'id/server/idserverlib/src/main/java')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java20
1 files changed, 14 insertions, 6 deletions
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;
}