You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2017/06/07 15:35:02 UTC
svn commit: r1797948 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java
Author: tilman
Date: Wed Jun 7 15:35:02 2017
New Revision: 1797948
URL: http://svn.apache.org/viewvc?rev=1797948&view=rev
Log:
PDFBOX-2852: simplify code, use jdk7 syntax
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java?rev=1797948&r1=1797947&r2=1797948&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java Wed Jun 7 15:35:02 2017
@@ -275,27 +275,16 @@ public abstract class FontDescriptorHelp
protected final byte[] getMetaDataStreamAsBytes(PDMetadata metadata)
{
- byte[] result = null;
- ByteArrayOutputStream bos = null;
- InputStream metaDataContent = null;
- try
+ try (InputStream metaDataContent = metadata.createInputStream())
{
- bos = new ByteArrayOutputStream();
- metaDataContent = metadata.createInputStream();
- IOUtils.copy(metaDataContent, bos);
- result = bos.toByteArray();
+ return IOUtils.toByteArray(metaDataContent);
}
catch (IOException e)
{
this.fContainer.push(new ValidationError(ERROR_METADATA_FORMAT_STREAM,
this.font.getName() + ": Unable to read font metadata due to : " + e.getMessage(), e));
+ return null;
}
- finally
- {
- IOUtils.closeQuietly(metaDataContent);
- IOUtils.closeQuietly(bos);
- }
- return result;
}
public static boolean isSubSet(String fontName)