aboutsummaryrefslogtreecommitdiff
path: root/id/server/idserverlib
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-02-24 15:20:22 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-02-24 15:20:22 +0100
commitf8b9d30b9c1b25b5e92bbb488394e41dbe8be7f1 (patch)
treeae08cc5e7295822b160b6c08f1ccddabeb5ea398 /id/server/idserverlib
parent3bee4536dce4136d83d6d815e6118e94f1efe8fd (diff)
downloadmoa-id-spss-f8b9d30b9c1b25b5e92bbb488394e41dbe8be7f1.tar.gz
moa-id-spss-f8b9d30b9c1b25b5e92bbb488394e41dbe8be7f1.tar.bz2
moa-id-spss-f8b9d30b9c1b25b5e92bbb488394e41dbe8be7f1.zip
fix bug, which brakes the error handling
Diffstat (limited to 'id/server/idserverlib')
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java4
-rw-r--r--id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java3
2 files changed, 6 insertions, 1 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
index 49035aba3..8567d7834 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractController.java
@@ -236,6 +236,8 @@ public abstract class AbstractController extends MOAIDAuthConstants {
}
+ writeHTMLErrorResponse(httpResp, context);
+
}
private void writeHTMLErrorResponse(HttpServletResponse httpResp, Exception error) throws IOException {
@@ -250,6 +252,8 @@ public abstract class AbstractController extends MOAIDAuthConstants {
context.put("stacktrace", getStacktraceFromException(error));
}
+
+ writeHTMLErrorResponse(httpResp, context);
}
private void writeHTMLErrorResponse(HttpServletResponse httpResp, VelocityContext context) throws IOException {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java
index 0b2fe879a..e6f08abd9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/AbstractAuthProtocolModulController.java
@@ -207,8 +207,9 @@ public abstract class AbstractAuthProtocolModulController extends AbstractContro
try {
Class<?> clazz = Class.forName(protocolRequest.requestedModule());
+
if (clazz == null ||
- !clazz.isInstance(IModulInfo.class)) {
+ !IModulInfo.class.isAssignableFrom(clazz)) {
Logger.fatal("Requested protocol module Class is NULL or does not implement the IModulInfo interface.");
throw new Exception("Requested protocol module Class is NULL or does not implement the IModulInfo interface.");