1 files changed, 47 insertions, 4 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 5fa0dfcc3..c3f835edb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -3,13 +3,16 @@ package at.gv.egovernment.moa.id.entrypoints;
 import java.io.IOException;
 import java.util.Iterator;
 
+import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
 import at.gv.egovernment.moa.id.MOAIDException;
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
 import at.gv.egovernment.moa.id.auth.WrongParametersException;
 import at.gv.egovernment.moa.id.auth.servlet.AuthServlet;
@@ -20,6 +23,7 @@ import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.moduls.ModulStorage;
 import at.gv.egovernment.moa.id.moduls.NoPassivAuthenticationException;
 import at.gv.egovernment.moa.id.moduls.RequestStorage;
+import at.gv.egovernment.moa.id.storage.ExceptionStoreImpl;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.logging.Logger;
 
@@ -52,6 +56,46 @@ public class DispatcherServlet extends AuthServlet {
 	protected void processRequest(HttpServletRequest req,
 			HttpServletResponse resp) throws ServletException, IOException {
 		try {
+			String errorid = req.getParameter(ERROR_CODE_PARAM);
+			if (errorid != null) {
+
+				Throwable throwable = ExceptionStoreImpl.getStore()
+						.fetchException(errorid);
+				ExceptionStoreImpl.getStore().removeException(errorid);
+
+				if (throwable != null) {
+
+					IRequest errorRequest = RequestStorage
+							.getPendingRequest(req.getSession());
+					if (errorRequest != null) {
+						try {
+							IModulInfo handlingModule = ModulStorage
+									.getModuleByPath(errorRequest
+											.requestedModule());
+							if (handlingModule != null) {
+								if (handlingModule.generateErrorMessage(
+										throwable, req, resp, errorRequest)) {
+									return;
+								}
+							}
+						} catch (Throwable e) {
+							Logger.error(e);
+							handleErrorNoRedirect(throwable.getMessage(),
+									throwable, req, resp);
+						}
+					}
+					handleErrorNoRedirect(throwable.getMessage(), throwable,
+							req, resp);
+
+				} else {
+					// TODO: use better string
+					handleErrorNoRedirect("UNKOWN ERROR DETECTED!", null, req,
+							resp);
+				}
+
+				return;
+			}
+
 			Object moduleObject = req.getParameter(PARAM_TARGET_MODULE);
 			String module = null;
 			if (moduleObject != null && (moduleObject instanceof String)) {
@@ -114,8 +158,7 @@ public class DispatcherServlet extends AuthServlet {
 			HttpSession httpSession = req.getSession();
 			IRequest protocolRequest = null;
 			try {
-				protocolRequest = RequestStorage
-						.getPendingRequest(httpSession);
+				protocolRequest = RequestStorage.getPendingRequest(httpSession);
 
 				if (protocolRequest != null) {
 					// check if pending request is same protocol and action
@@ -183,11 +226,11 @@ public class DispatcherServlet extends AuthServlet {
 				}
 
 				moduleAction.processRequest(protocolRequest, req, resp);
-				
+
 				RequestStorage.removePendingRequest(httpSession);
 
 				AuthenticationManager.logout(req, resp);
-				
+
 			} catch (Throwable e) {
 				e.printStackTrace();
 				// Try handle module specific, if not possible rethrow