Make sure writer is closed.

Author: dizzzz

exist-ant/src/main/java/org/exist/ant/XMLDBXPathTask.java

@@ -36,11 +36,7 @@
 import org.exist.util.serializer.SAXSerializer;
 import org.exist.util.serializer.SerializerPool;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.*;
 
 import java.util.Properties;
 
@@ -179,27 +175,11 @@ private void writeResource(final XMLResource resource, final File dest) throws I
 
             final SAXSerializer serializer = (SAXSerializer) SerializerPool.getInstance().borrowObject(SAXSerializer.class);
 
-            final Writer writer;
-            if (dest.isDirectory()) {
-
-                if (!dest.exists()) {
-                    dest.mkdirs();
-                }
-                String fname = resource.getId();
-
-                if (!fname.endsWith(".xml")) {
-                    fname += ".xml";
-                }
-                final File file = new File(dest, fname);
-                writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8);
-            } else {
-                writer = new OutputStreamWriter(new FileOutputStream(dest), UTF_8 );
+            try(final Writer writer = getWriter(resource, dest)) {
+                serializer.setOutput(writer, outputProperties);
+                resource.getContentAsSAX(serializer);
             }
 
-            serializer.setOutput(writer, outputProperties);
-            resource.getContentAsSAX(serializer);
-            writer.close();
-
             SerializerPool.getInstance().returnObject(serializer);
 
         } else {
@@ -213,6 +193,26 @@ private void writeResource(final XMLResource resource, final File dest) throws I
         }
     }
 
+    private Writer getWriter(XMLResource resource, File dest) throws XMLDBException, FileNotFoundException {
+        final Writer writer;
+        if (dest.isDirectory()) {
+
+            if (!dest.exists()) {
+                dest.mkdirs();
+            }
+            String fname = resource.getId();
+
+            if (!fname.endsWith(".xml")) {
+                fname += ".xml";
+            }
+            final File file = new File(dest, fname);
+            writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8);
+        } else {
+            writer = new OutputStreamWriter(new FileOutputStream(dest), UTF_8 );
+        }
+        return writer;
+    }
+
     /**
      * Set the query.
      *

exist-ant/src/main/java/org/exist/ant/XMLDBXQueryTask.java

@@ -43,11 +43,7 @@
 import org.exist.xmldb.EXistXQueryService;
 import org.exist.xmldb.XmldbURI;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
+import java.io.*;
 
 import java.net.URL;
 
@@ -192,29 +188,10 @@ private void writeResource(final XMLResource resource, final File dest) throws I
 
             final SAXSerializer serializer = (SAXSerializer) SerializerPool.getInstance().borrowObject(SAXSerializer.class);
 
-            final Writer writer;
-            if (dest.isDirectory()) {
-
-                if (!dest.exists()) {
-                    dest.mkdirs();
-                }
-
-                String fname = resource.getId();
-
-                if (!fname.endsWith(".xml")) {
-                    fname += ".xml";
-                }
-
-                final File file = new File(dest, fname);
-                writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8);
-
-            } else {
-                writer = new OutputStreamWriter(new FileOutputStream(dest), UTF_8);
+            try(final Writer writer = getWriter(resource, dest)) {
+                serializer.setOutput(writer, outputProperties);
+                resource.getContentAsSAX(serializer);
             }
-
-            serializer.setOutput(writer, outputProperties);
-            resource.getContentAsSAX(serializer);
-            writer.close();
             SerializerPool.getInstance().returnObject(serializer);
 
         } else {
@@ -228,6 +205,29 @@ private void writeResource(final XMLResource resource, final File dest) throws I
         }
     }
 
+    private Writer getWriter(XMLResource resource, File dest) throws XMLDBException, FileNotFoundException {
+        final Writer writer;
+        if (dest.isDirectory()) {
+
+            if (!dest.exists()) {
+                dest.mkdirs();
+            }
+
+            String fname = resource.getId();
+
+            if (!fname.endsWith(".xml")) {
+                fname += ".xml";
+            }
+
+            final File file = new File(dest, fname);
+            writer = new OutputStreamWriter(new FileOutputStream(file), UTF_8);
+
+        } else {
+            writer = new OutputStreamWriter(new FileOutputStream(dest), UTF_8);
+        }
+        return writer;
+    }
+
 
     public void addText(final String text) {
         this.text = text;