svn commit: r1692323 - /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/MetadataValidationProcess.java

[ti...@apache.org]

Author: tilman
Date: Wed Jul 22 19:47:25 2015
New Revision: 1692323

URL: http://svn.apache.org/r1692323
Log:
PDFBOX-2852: no need to use byte array; no need for method to be public

Modified:
    pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/MetadataValidationProcess.java

Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/MetadataValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/MetadataValidationProcess.java?rev=1692323&r1=1692322&r2=1692323&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/MetadataValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/MetadataValidationProcess.java Wed Jul 22 19:47:25 2015
@@ -66,11 +66,10 @@ public class MetadataValidationProcess e
         {
             PDDocument document = ctx.getDocument();
 
-            byte[] tmp = getXpacket(document.getDocument());
-            DomXmpParser builder;
-            builder = new DomXmpParser();
-            XMPMetadata metadata;
-            metadata = builder.parse(tmp);
+            InputStream is = getXpacket(document.getDocument());
+            DomXmpParser builder = new DomXmpParser();
+            XMPMetadata metadata = builder.parse(is);
+            is.close();
             ctx.setMetadata(metadata);
 
             // 6.7.5 no deprecated attribute in xpacket processing instruction
@@ -254,7 +253,7 @@ public class MetadataValidationProcess e
     /**
      * Return the xpacket from the dictionary's stream
      */
-    public static byte[] getXpacket(COSDocument cdocument) throws IOException, XpacketParsingException
+    static InputStream getXpacket(COSDocument cdocument) throws IOException, XpacketParsingException
     {
         COSObject catalog = cdocument.getCatalog();
         COSBase cb = catalog.getDictionaryObject(COSName.METADATA);
@@ -284,12 +283,7 @@ public class MetadataValidationProcess e
         }
 
         COSStream stream = (COSStream)metadataDictionnary;
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        InputStream is = stream.getUnfilteredStream();
-        IOUtils.copy(is, bos);
-        is.close();
-        bos.close();
-        return bos.toByteArray();
+        return stream.getUnfilteredStream();
     }
 
     /**