1 files changed, 8 insertions, 31 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java
index 1d8ee0b..aec4f25 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/SignPreviewServlet.java
@@ -24,13 +24,11 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
-import at.knowcenter.wag.egov.egiz.exceptions.ErrorCodeException;
+import at.gv.egiz.pdfas.web.SignSessionInformation;
+import at.gv.egiz.pdfas.web.helper.SessionHelper;
+import at.gv.egiz.pdfas.web.helper.SignServletHelper;
 import at.knowcenter.wag.egov.egiz.exceptions.PresentableException;
-import at.knowcenter.wag.egov.egiz.web.FormFields;
-import at.knowcenter.wag.egov.egiz.web.SessionAttributes;
-import at.knowcenter.wag.egov.egiz.web.SessionInformation;
 
 /**
  * @author wprinz
@@ -55,34 +53,13 @@ public class SignPreviewServlet extends HttpServlet
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException
   {
-    SessionInformation si = null;
     try
     {
-      HttpSession session = request.getSession(false);
-      if (session == null)
-      {
-        throw new ErrorCodeException(600, "The session is missing.");
-      }
-
-      si = (SessionInformation) session.getAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
-      if (si == null)
-      {
-        throw new ErrorCodeException(600, "The session is not found or is no longer valid.");
-      }
-
-    }
-    catch (PresentableException e)
-    {
-      e.printStackTrace();
-      SignServlet.prepareDispatchToErrorPage(e, request);
-      dispatch(request, response, "/jsp/error.jsp");
-
-      return;
-    }
-
-    try
-    {
-      SignServlet.finishSign(si, request, response, getServletContext());
+      Object sessionObject = SessionHelper.getSession(request);
+      
+      SignSessionInformation si = (SignSessionInformation) sessionObject;
+      
+      SignServletHelper.finishSign(si, request, response, getServletContext());
     }
     catch (PresentableException e)
     {