svn commit: r1797940 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java

[ti...@apache.org]

Author: tilman
Date: Wed Jun  7 15:25:09 2017
New Revision: 1797940

URL: http://svn.apache.org/viewvc?rev=1797940&view=rev
Log:
PDFBOX-2852: simplify code, use jdk7 syntax

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java?rev=1797940&r1=1797939&r2=1797940&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java Wed Jun  7 15:25:09 2017
@@ -33,22 +33,11 @@ final class ASCII85Filter extends Filter
     public DecodeResult decode(InputStream encoded, OutputStream decoded,
                                          COSDictionary parameters, int index) throws IOException
     {
-        ASCII85InputStream is = null;
-        try
+        try (ASCII85InputStream is = new ASCII85InputStream(encoded))
         {
-            is = new ASCII85InputStream(encoded);
-            byte[] buffer = new byte[1024];
-            int amountRead;
-            while((amountRead = is.read(buffer, 0, 1024))!= -1)
-            {
-                decoded.write(buffer, 0, amountRead);
-            }
-            decoded.flush();
-        }
-        finally
-        {
-            IOUtils.closeQuietly(is);
+            IOUtils.copy(is, decoded);
         }
+        decoded.flush();
         return new DecodeResult(parameters);
     }
 
@@ -58,12 +47,7 @@ final class ASCII85Filter extends Filter
     {
         try (ASCII85OutputStream os = new ASCII85OutputStream(encoded))
         {
-            byte[] buffer = new byte[1024];
-            int amountRead;
-            while ((amountRead = input.read(buffer, 0, 1024)) != -1)
-            {
-                os.write(buffer, 0, amountRead);
-            }
+            IOUtils.copy(input, os);
         }
         encoded.flush();
     }