svn commit: r1826449 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java

[msahyoun]

Author: msahyoun
Date: Sun Mar 11 18:48:24 2018
New Revision: 1826449

URL: http://svn.apache.org/viewvc?rev=1826449&view=rev
Log:
PDFBOX-4071: revert use of JDK7 try-with; doesn't work well with detached 
signature and others

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java?rev=1826449&r1=1826448&r2=1826449&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java 
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocument.java 
Sun Mar 11 18:48:24 2018
@@ -982,7 +982,8 @@ public class PDDocument implements Close
     public static PDDocument load(File file, String password, InputStream 
keyStore, String alias,
                                   MemoryUsageSetting memUsageSetting) throws 
IOException
     {
-        try (RandomAccessBufferedFileInputStream raFile = new 
RandomAccessBufferedFileInputStream(file))
+        RandomAccessBufferedFileInputStream raFile = new 
RandomAccessBufferedFileInputStream(file);
+        try
         {
             ScratchFile scratchFile = new ScratchFile(memUsageSetting);
             try
@@ -999,6 +1000,7 @@ public class PDDocument implements Close
         }
         catch (IOException ioe)
         {
+            IOUtils.closeQuietly(raFile);
             throw ioe;
         }
     }