rebuild error messaging in case of taskExecution errorsMOA-ID-3.1.0_RC1

2 files changed, 10 insertions, 8 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
index 43f4f90ff..fe24d45dd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/AuthServlet.java
@@ -197,11 +197,6 @@ public class AuthServlet extends HttpServlet {
 					procExc.getCause() instanceof TaskExecutionException) {
 				TaskExecutionException taskExc = (TaskExecutionException) procExc.getCause();
 				loggedException = taskExc.getOriginalException();	
-				if (Logger.isDebugEnabled() || Logger.isTraceEnabled()) {
-					Logger.error(exceptionThrown.getMessage(), exceptionThrown);
-					
-				} else
-					Logger.error(exceptionThrown.getMessage());
 								
 			}			
 		}
@@ -213,6 +208,14 @@ public class AuthServlet extends HttpServlet {
 		if (!(loggedException instanceof MOAIDException)) {
 			Logger.error("Receive an internal error: Message=" + loggedException.getMessage(), loggedException);
 			
+		} else {
+			if (Logger.isDebugEnabled() || Logger.isTraceEnabled()) {
+				Logger.error(loggedException.getMessage(), loggedException);
+			
+			} else {
+				Logger.error(loggedException.getMessage());
+			
+			}			
 		}
 		
 		IExceptionStore store = DBExceptionStoreImpl.getStore();
diff --git a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java
index 20f102571..307074ee2 100644
--- a/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java
+++ b/id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/CreateIdentityLinkFormTask.java
@@ -1,6 +1,6 @@
 package at.gv.egovernment.moa.id.auth.modules.internal.tasks;
 
-import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.*;
+import static at.gv.egovernment.moa.id.auth.MOAIDAuthConstants.PARAM_SESSIONID;
 
 import java.io.PrintWriter;
 
@@ -21,7 +21,6 @@ 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.auth.servlet.GenerateIFrameTemplateServlet;
-
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.moduls.RequestStorage;
@@ -119,7 +118,7 @@ public class CreateIdentityLinkFormTask extends AbstractAuthServletTask {
 		}
 
 		catch (MOAIDException ex) {
-//			handleError(null, ex, req, resp, pendingRequestID);
+			Logger.info("GetIdentityLink request generation FAILED. Reason:" + ex.getMessage());
 			throw new TaskExecutionException(ex.getMessage(), ex);
 
 		} catch (Exception e) {