svn commit: r1611844 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java

[ti...@apache.org]

Author: tilman
Date: Sat Jul 19 04:10:37 2014
New Revision: 1611844

URL: http://svn.apache.org/r1611844
Log:
PDFBOX-2225: don't cast Exception into IOException, as suggested by Brandon Lyon

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java?rev=1611844&r1=1611843&r2=1611844&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java Sat Jul 19 04:10:37 2014
@@ -63,7 +63,7 @@ public class PDFMergerUtility
 {
     private static final String STRUCTURETYPE_DOCUMENT = "Document";
 
-    private List<InputStream> sources;
+    private final List<InputStream> sources;
     private String destinationFileName;
     private OutputStream destinationStream;
     private boolean ignoreAcroFormErrors = false;
@@ -202,7 +202,7 @@ public class PDFMergerUtility
         PDDocument source;
         if (sources != null && sources.size() > 0)
         {
-            java.util.Vector<PDDocument> tobeclosed = new java.util.Vector<PDDocument>();
+            ArrayList<PDDocument> tobeclosed = new ArrayList<PDDocument>();
 
             try
             {
@@ -331,14 +331,18 @@ public class PDFMergerUtility
                 }
             }
         }
-        catch (Exception e)
+        catch (IOException e)
         {
             // if we are not ignoring exceptions, we'll re-throw this
             if (!ignoreAcroFormErrors)
             {
-                throw (IOException) e;
+                throw new IOException(e);
             }
         }
+        catch (Exception e)
+        {
+            throw new RuntimeException(e);
+        }
 
         COSArray destThreads = (COSArray) destCatalog.getCOSDictionary().getDictionaryObject(COSName.THREADS);
         COSArray srcThreads = (COSArray) cloner.cloneForNewDocument(destCatalog.getCOSDictionary().getDictionaryObject(
@@ -401,7 +405,7 @@ public class PDFMergerUtility
         if (srcLabels != null)
         {
             int destPageCount = destination.getNumberOfPages();
-            COSArray destNums = null;
+            COSArray destNums;
             if (destLabels == null)
             {
                 destLabels = new COSDictionary();