1 files changed, 12 insertions, 8 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
index 1e1a4df89..64dcb0f41 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/VerifyAuthenticationBlockTask.java
@@ -25,6 +25,7 @@ import at.gv.egovernment.moa.id.auth.exception.MISSimpleClientException;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.modules.AbstractAuthServletTask;
+import at.gv.egovernment.moa.id.auth.modules.TaskExecutionException;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.config.ConnectionParameter;
@@ -77,7 +78,7 @@ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask {
 
 	@Override
 	public void execute(ExecutionContext executionContext, HttpServletRequest req, HttpServletResponse resp)
-			throws Exception {
+			throws TaskExecutionException {
 
 		// note: code taken from at.gv.egovernment.moa.id.auth.servlet.VerifyAuthenticationBlockServlet
 		
@@ -89,12 +90,13 @@ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask {
 	    try 
 	    {
 	      parameters = getParameters(req);
-	    } catch (FileUploadException e) 
+	      
+	    } catch (FileUploadException | IOException e) 
 	    {
 	      Logger.error("Parsing mulitpart/form-data request parameters failed: " + e.getMessage());
-	      throw new IOException(e.getMessage());
-	      
+	      throw new TaskExecutionException("Parsing mulitpart/form-data request parameters failed", new IOException(e.getMessage()));
 	    }
+	      
 			String sessionID = req.getParameter(PARAM_SESSIONID);
 			String createXMLSignatureResponse = (String)parameters.get(PARAM_XMLRESPONSE);
 
@@ -219,19 +221,21 @@ public class VerifyAuthenticationBlockTask extends AbstractAuthServletTask {
 			}
 	    
 			catch (MOAIDException ex) {
-				handleError(null, ex, req, resp, pendingRequestID);
+				throw new TaskExecutionException(ex.getMessage(), ex);
 				
 			} catch (GeneralSecurityException e) {
-				handleError(null, e, req, resp, pendingRequestID);
+				throw new TaskExecutionException(e.getMessage(), e);
 				
 			} catch (PKIException e) {
-				handleError(null, e, req, resp, pendingRequestID);
+				throw new TaskExecutionException(e.getMessage(), e);
 				
 			} catch (TransformerException e) {
-				handleError(null, e, req, resp, pendingRequestID);
+				throw new TaskExecutionException(e.getMessage(), e);
 				
 		    } catch (Exception e) {
 		    	Logger.error("AuthBlockValidation has an interal Error.", e);
+		    	throw new TaskExecutionException(e.getMessage(), e);
+		    	
 		    }