1 files changed, 35 insertions, 23 deletions
diff --git a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
index c40f3c6..803dc59 100644
--- a/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
+++ b/src/main/java/at/knowcenter/wag/egov/egiz/web/servlets/ProvidePDFServlet.java
@@ -42,9 +42,9 @@ public class ProvidePDFServlet extends HttpServlet {
    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
       
       String pdfIdString = request.getParameter(FormFields.FIELD_PDF_ID);
+      HttpSession session = request.getSession();
       
       if (pdfIdString == null) {
-         HttpSession session = request.getSession(true);
          log.debug("No " + FormFields.FIELD_PDF_ID + " provided. Trying to retrieve PDF from session (" + session.getId() + ").");
          SignSessionInformation si = (SignSessionInformation) session.getAttribute(SessionAttributes.SIGNED_PDF_DOCUMENT);
          if (si == null) {
@@ -59,39 +59,51 @@ public class ProvidePDFServlet extends HttpServlet {
             log.debug("Signed pdf found.");
             session.removeAttribute(SessionAttributes.SIGNED_PDF_DOCUMENT);
             log.debug("Returning signed pdf to browser.");
-//            log.debug("Invalidating session.");
-//            session.invalidate();
             SignServletHelper.returnSignResponse(si, request, response);
             return;
          }
       } else {
          long pdfId = Long.parseLong(pdfIdString);
 
-         Iterator it = signedDocuments.iterator();
+         byte[] pdf = null;
+         
+         synchronized (signedDocuments) {
+            Iterator it = signedDocuments.iterator();
 
-         while (it.hasNext()) {
-            PDFContainer current = (PDFContainer) it.next();
-            if (current.id == pdfId) {
-               try {
-                  byte[] pdf = current.pdf;
-
-                  response.setContentType("application/pdf");
-                  response.setContentLength(pdf.length);
-
-                  InputStream is = new ByteArrayInputStream(pdf);
-                  final int bufferSize = 1024;
-                  byte[] buffer = new byte[bufferSize];
-                  int len = -1;
-                  while ((len = is.read(buffer)) != -1) {
-                     response.getOutputStream().write(buffer, 0, len);
-                  }
-                  response.getOutputStream().flush();
+            while (it.hasNext() && pdf == null) {
+               PDFContainer current = (PDFContainer) it.next();
+               if (current.id == pdfId) {
+                  pdf = current.pdf;
                   signedDocuments.remove(current);
-               } catch (IOException e) {
-                  log.error("IO excepton while providing pdf document: " + e.getMessage(), e);
                }
             }
          }
+         
+         if (pdf != null) {
+            try {
+
+               SignServletHelper.disableBrowserCacheForResponse(response);
+               response.setContentType("application/pdf");
+               response.setContentLength(pdf.length);
+               
+               InputStream is = new ByteArrayInputStream(pdf);
+               final int bufferSize = 1024;
+               byte[] buffer = new byte[bufferSize];
+               int len = -1;
+               while ((len = is.read(buffer)) != -1) {
+                  response.getOutputStream().write(buffer, 0, len);
+               }
+               response.getOutputStream().flush();
+               log.debug("File sent. Invalidating session.");
+               session.invalidate();
+            } catch (IOException e) {
+               log.error("IO excepton while providing pdf document: " + e.getMessage(), e);
+            }
+         } else {
+            log.error("Unable to find signed pdf (id=" + pdfId + ") in session (" + session.getId() + ").");
+            return;
+         }
+         
       }
 
    }