Changeset 3591 for print

Timestamp:

07/20/10 15:00:32 (22 months ago)

Author:

jeichar

Message:

Hopefully the fix for too many open files error.

r=fredj
closes #586

Location:

print/trunk/src/main/java/org/mapfish/print

Files:

• ShellMapPrinter.java (modified) (1 diff)
• servlet/MapPrinterServlet.java (modified) (10 diffs)

print/trunk/src/main/java/org/mapfish/print/ShellMapPrinter.java

@@ -90 +90 @@
     public void run() throws IOException, JSONException, DocumentException {
         final OutputStream outFile = getOutputStream();
-        if (clientConfig) {
-            final OutputStreamWriter writer = new OutputStreamWriter(outFile, Charset.forName("UTF-8"));
-            JSONWriter json = new JSONWriter(writer);
-            json.object();
-            {
-                printer.printClientConfig(json);
+        try {
+            if (clientConfig) {
+                final OutputStreamWriter writer = new OutputStreamWriter(outFile, Charset.forName("UTF-8"));
+                JSONWriter json = new JSONWriter(writer);
+                json.object();
+                {
+                    printer.printClientConfig(json);
+                }
+                json.endObject();
+
+                writer.close();
+
+            } else {
+                final InputStream inFile = getInputStream();
+                printer.print(FileUtilities.readWholeTextStream(inFile, "UTF-8"), outFile, referer);
             }
-            json.endObject();
-
-            writer.close();
-
-        } else {
-            final InputStream inFile = getInputStream();
-            printer.print(FileUtilities.readWholeTextStream(inFile, "UTF-8"), outFile, referer);
+        } finally {
+            outFile.close();
+            printer.stop();
         }
-        printer.stop();
     }
 

print/trunk/src/main/java/org/mapfish/print/servlet/MapPrinterServlet.java

@@ -155 +155 @@
         final String id = generateId(tempFile);
         httpServletResponse.setContentType("application/json; charset=utf-8");
-        try {
-            final PrintWriter writer = httpServletResponse.getWriter();
+        PrintWriter writer = null;
+        try {
+            writer = httpServletResponse.getWriter();
             JSONWriter json = new JSONWriter(writer);
             json.object();
@@ -169 +170 @@
             deleteFile(tempFile);
             throw new ServletException(e);
+        } finally {
+            if(writer != null) {
+                writer.close();
+            }
         }
         addTempFile(tempFile, id);
@@ -181 +186 @@
     protected String getSpecFromPostBody(HttpServletRequest httpServletRequest) throws IOException {
         BufferedReader data = httpServletRequest.getReader();
-        StringBuilder spec = new StringBuilder();
-        String cur;
-        while ((cur = data.readLine()) != null) {
-            spec.append(cur).append("\n");
-        }
-        return spec.toString();
+        try {
+            StringBuilder spec = new StringBuilder();
+            String cur;
+            while ((cur = data.readLine()) != null) {
+                spec.append(cur).append("\n");
+            }
+            return spec.toString();
+        } finally {
+            if(data != null) {
+                data.close();
+            }
+        }
     }
 
     /**
      * To get the PDF created previously.
-     * @param httpServletRequest 
      */
     protected void getPDF(HttpServletRequest req, HttpServletResponse httpServletResponse, String id) throws IOException {
@@ -213 +223 @@
         final PrintWriter writer = resp.getWriter();
 
-        final String var = req.getParameter("var");
-        if (var != null) {
-            writer.print(var + "=");
-        }
-
-        JSONWriter json = new JSONWriter(writer);
-        try {
-            json.object();
-            {
-                printer.printClientConfig(json);
-                json.key("printURL").value(basePath + PRINT_URL);
-                json.key("createURL").value(basePath + CREATE_URL);
-            }
-            json.endObject();
-        } catch (JSONException e) {
-            throw new ServletException(e);
-        }
-        if (var != null) {
-            writer.print(";");
-        }
-        writer.close();
+        try {
+            final String var = req.getParameter("var");
+            if (var != null) {
+                writer.print(var + "=");
+            }
+
+            JSONWriter json = new JSONWriter(writer);
+            try {
+                json.object();
+                {
+                    printer.printClientConfig(json);
+                    json.key("printURL").value(basePath + PRINT_URL);
+                    json.key("createURL").value(basePath + CREATE_URL);
+                }
+                json.endObject();
+            } catch (JSONException e) {
+                throw new ServletException(e);
+            }
+            if (var != null) {
+                writer.print(";");
+            }
+        } finally {
+            writer.close();
+        }
     }
 
@@ -248 +261 @@
         //create a temporary file that will contain the PDF
         TempFile tempFile = new TempFile(File.createTempFile(TEMP_FILE_PREFIX, TEMP_FILE_SUFFIX, getTempDir()));
-        try {
-            FileOutputStream out = new FileOutputStream(tempFile);
-
+        FileOutputStream out = null;
+        try {
+            out = new FileOutputStream(tempFile);
             getMapPrinter().print(spec, out, referer);
-            out.close();
+
             return tempFile;
         } catch (IOException e) {
@@ -263 +276 @@
             deleteFile(tempFile);
             throw e;
+        } finally {
+            if (out != null)
+                out.close();
         }
     }
@@ -272 +288 @@
         FileInputStream pdf = new FileInputStream(tempFile);
         final OutputStream response = httpServletResponse.getOutputStream();
+        try {
         httpServletResponse.setContentType("application/pdf");
         if (inline != true) {
@@ -277 +294 @@
         }
         FileUtilities.copyStream(pdf, response);
-        pdf.close();
-        response.close();
+        } finally {
+            try {
+                pdf.close();
+            } finally{
+                response.close();
+            }
+        }
     }
 
@@ -285 +307 @@
      */
     protected void error(HttpServletResponse httpServletResponse, Throwable e) {
+        PrintWriter out = null;
         try {
             httpServletResponse.setContentType("text/plain");
             httpServletResponse.setStatus(500);
-            PrintWriter out = httpServletResponse.getWriter();
+            out = httpServletResponse.getWriter();
             out.println("Error while generating PDF:");
             e.printStackTrace(out);
-            out.close();
 
             LOGGER.error("Error while generating PDF", e);
         } catch (IOException ex) {
             throw new RuntimeException(e);
+        } finally {
+            if (out != null) {
+                out.close();
+            }
         }
     }
@@ -303 +329 @@
      */
     protected void error(HttpServletResponse httpServletResponse, String message, int code) {
+        PrintWriter out = null;
         try {
             httpServletResponse.setContentType("text/plain");
             httpServletResponse.setStatus(code);
-            PrintWriter out = httpServletResponse.getWriter();
+            out = httpServletResponse.getWriter();
             out.println("Error while generating PDF:");
             out.println(message);
-            out.close();
+
             LOGGER.error("Error while generating PDF: " + message);
         } catch (IOException ex) {
             throw new RuntimeException(ex);
+        } finally {
+            if (out != null) {
+                out.close();
+            }
         }
     }