svn commit: r1847125 - in /pdfbox/branches/2.0/pdfbox/src: main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java

[ti...@apache.org]

Author: tilman
Date: Wed Nov 21 17:46:48 2018
New Revision: 1847125

URL: http://svn.apache.org/viewvc?rev=1847125&view=rev
Log:
PDFBOX-4383: don't store file as FileInputStream, add "previously failing" test

Modified:
    pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
    pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java

Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?rev=1847125&r1=1847124&r2=1847125&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Wed Nov 21 17:46:48 2018
@@ -224,8 +224,7 @@ public class PDFMergerUtility
      */
     public void addSource(File source) throws FileNotFoundException
     {
-        FileInputStream stream = new FileInputStream(source);
-        sources.add(stream);
+        sources.add(source);
     }
 
     /**

Modified: pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?rev=1847125&r1=1847124&r2=1847125&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java Wed Nov 21 17:46:48 2018
@@ -17,7 +17,9 @@ package org.apache.pdfbox.multipdf;
 
 import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -234,6 +236,42 @@ public class PDFMergerUtilityTest extend
         doc.close();
     }
 
+    /**
+     * PDFBOX-4383: Test that file can be deleted after merge.
+     *
+     * @throws IOException 
+     */
+    public void testFileDeletion() throws IOException
+    {
+        File outFile = new File(TARGETTESTDIR, "PDFBOX-4383-result.pdf");
+
+        File inFile1 = new File(TARGETTESTDIR, "PDFBOX-4383-src1.pdf");
+        File inFile2 = new File(TARGETTESTDIR, "PDFBOX-4383-src2.pdf");
+
+        createSimpleFile(inFile1);
+        createSimpleFile(inFile2);
+
+        OutputStream out = new FileOutputStream(outFile);
+        PDFMergerUtility merger = new PDFMergerUtility();
+        merger.setDestinationStream(out);
+        merger.addSource(inFile1);
+        merger.addSource(inFile2);
+        merger.mergeDocuments(MemoryUsageSetting.setupMainMemoryOnly());
+        out.close();
+
+        assertTrue(inFile1.delete());
+        assertTrue(inFile2.delete());
+        assertTrue(outFile.delete());
+    }
+
+    private void createSimpleFile(File file) throws IOException
+    {
+        PDDocument doc = new PDDocument();
+        doc.addPage(new PDPage());
+        doc.save(file);
+        doc.close();
+    }
+
     private class ElementCounter
     {
         int cnt = 0;