aboutsummaryrefslogtreecommitdiff
path: root/id/server
diff options
context:
space:
mode:
authorThomas Lenz <tlenz@iaik.tugraz.at>2016-03-24 15:46:48 +0100
committerThomas Lenz <tlenz@iaik.tugraz.at>2016-03-24 15:46:48 +0100
commit5b1f6e34fa4c9fd6c992efd347127db863fb1031 (patch)
treef327fdb4bd46b325570a50d820ad09521b256dce /id/server
parent1bad771fdccff20e21b79f88266d194ea71a0df1 (diff)
downloadmoa-id-spss-5b1f6e34fa4c9fd6c992efd347127db863fb1031.tar.gz
moa-id-spss-5b1f6e34fa4c9fd6c992efd347127db863fb1031.tar.bz2
moa-id-spss-5b1f6e34fa4c9fd6c992efd347127db863fb1031.zip
fix possible NullPointer in error handling
Diffstat (limited to 'id/server')
-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/auth/servlet/AbstractProcessEngineSignalController.java1
2 files changed, 5 insertions, 0 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 1a029a9fa..e51f3e6c9 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
@@ -111,6 +111,10 @@ public abstract class AbstractController extends MOAIDAuthConstants {
//set original exception
loggedException = ((TaskExecutionException) extractedException).getOriginalException();
+ //use TaskExecutionException directly, if no Original Exeception is included
+ if (loggedException == null)
+ loggedException = exceptionThrown;
+
//set pending-request ID if it is set
String reqID = ((TaskExecutionException) extractedException).getPendingRequestID();
if (MiscUtil.isNotEmpty(reqID))
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
index f22c82e95..7a4ee35fa 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AbstractProcessEngineSignalController.java
@@ -44,6 +44,7 @@ public abstract class AbstractProcessEngineSignalController extends AbstractCont
//change pending-request ID
requestStorage.changePendingRequestID(pendingReq);
+ pendingRequestID = pendingReq.getRequestID();
//add transactionID and unique sessionID to Logger
TransactionIDUtils.setSessionId(pendingReq.getUniqueSessionIdentifier());