diff options
author | Thomas <> | 2021-04-21 07:42:50 +0200 |
---|---|---|
committer | Thomas <> | 2021-04-21 07:42:50 +0200 |
commit | 3cbba3fcda614fa37357822d0eeb543c3e19276e (patch) | |
tree | 1941c8a1e78eaa4f9e93d247c9ec26657dd2da22 /eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller | |
parent | 2f5425491ac88ec4b65157ac85bde58fb7dce34c (diff) | |
download | EAAF-Components-3cbba3fcda614fa37357822d0eeb543c3e19276e.tar.gz EAAF-Components-3cbba3fcda614fa37357822d0eeb543c3e19276e.tar.bz2 EAAF-Components-3cbba3fcda614fa37357822d0eeb543c3e19276e.zip |
some small updates in central error-handling
Diffstat (limited to 'eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller')
2 files changed, 6 insertions, 3 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java index a8b0a961..dce2251a 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/ProtocolFinalizationController.java @@ -105,14 +105,17 @@ public class ProtocolFinalizationController extends AbstractController { if (pendingReq != null) { IModulInfo handlingModule = ProtocolAuthenticationService .extractShibbolethHandling(pendingReq, applicationContext); - - handlingModule.generateErrorMessage(throwable, req, resp, pendingReq); + if (!handlingModule.generateErrorMessage(throwable, req, resp, pendingReq)) { + protAuthService.handleErrorNoRedirect(new EaafException("process.90", null), req, resp, false); + + } } } } } catch (Throwable e) { log.error(e.getMessage(), e); protAuthService.handleErrorNoRedirect(e, req, resp, false); + } finally { // remove pending-request if (pendingReq != null) { diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java index 08bf588f..c3f3d32e 100644 --- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java +++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/controller/tasks/RestartAuthProzessManagement.java @@ -82,7 +82,7 @@ public class RestartAuthProzessManagement extends AbstractAuthServletTask { if (processDefinitionId == null) { log.warn("No suitable authentication process found for SessionID " + pendingReq.getPendingRequestId()); - throw new EaafException("process.02", new Object[] { pendingReq.getPendingRequestId() }); + throw new EaafException("process.02", null); } final String processInstanceId = |