1 files changed, 25 insertions, 19 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/AsynchronousRedirectResponder.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/AsynchronousRedirectResponder.java
index fb5d2e3..b79dd87 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/AsynchronousRedirectResponder.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/AsynchronousRedirectResponder.java
@@ -128,19 +128,18 @@ public class AsynchronousRedirectResponder extends HttpServlet
         dispatchToRedirectRefreshPage(request, response, refresh_url);
         return;
       }
-
-      si.finished = false;
-
+      
+      // si.finished is true, but maybe there are more requests to process.
       if (si.current_operation < si.requests.length)
       {
+        si.finished = false;
+
         LocalRequestHelper.prepareDispatchToLocalConnectionPage(si.requests[si.current_operation], request, response);
         dispatch(request, response, LocalRequestHelper.LOCAL_CONNECTION_PAGE_JSP);
         return;
       }
 
       // all requests have been carried out.
-      //session.removeAttribute(SessionAttributes.ATTRIBUTE_SESSION_INFORMATION);
-      //SessionTable.remove(si.session_id);
 
       BKUConnector local_conn = (BKUConnector) ConnectorFactory.createConnector(si.connector);
 
@@ -161,22 +160,29 @@ public class AsynchronousRedirectResponder extends HttpServlet
         //logger_.debug("AsyncRedirResponder: si.response_string[0] = " + si.response_string[0]);
         logger_.debug("AsyncRedirResponder: si.current_op = " + si.current_operation);
 
-        if (si.response_string[0] == null)
+        // The response string must not be null here - otherwise finished mustn't have been set!
+//        if (si.response_string[0] == null)
+//        {
+//          String url = request.getRequestURL().toString();
+//          logger_.debug("RequestURL = " + url);
+//          String refresh_url = response.encodeURL(url);
+//          logger_.debug("RefreshURL = " + refresh_url);
+//          dispatchToRedirectRefreshPage(request, response, refresh_url);
+//          return ;
+//        }
+        
+        // A download blocker may have blocked the first download.
+        // So, if the user asks for the document a second time and the sign_result
+        // has already been computed - don't recompute it.
+        if (si.sign_result == null)
         {
-          String url = request.getRequestURL().toString();
-          logger_.debug("RequestURL = " + url);
-          String refresh_url = response.encodeURL(url);
-          logger_.debug("RefreshURL = " + refresh_url);
-          dispatchToRedirectRefreshPage(request, response, refresh_url);
-          return ;
+          si.iui.signed_signature_object = local_conn.analyzeSignResponse(si.response_string[0], si.type);
+          
+          PdfASID algorithm = FormFields.translateSignatureModeToPdfASID(si.mode);
+          Signator signator = SignatorFactory.createSignator(algorithm);
+  
+          si.sign_result = signator.finishSign(si.iui);
         }
-        
-        si.iui.signed_signature_object = local_conn.analyzeSignResponse(si.response_string[0], si.type);
-        
-        PdfASID algorithm = FormFields.translateSignatureModeToPdfASID(si.mode);
-        Signator signator = SignatorFactory.createSignator(algorithm);
-
-        si.sign_result = signator.finishSign(si.iui);
 
         Sign.returnSignResponse(si, response);
       }