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:46:40 UTC
svn commit: r1797957 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
Author: tilman
Date: Wed Jun 7 15:46:40 2017
New Revision: 1797957
URL: http://svn.apache.org/viewvc?rev=1797957&view=rev
Log:
PDFBOX-2852: use jdk7 syntax
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1797957&r1=1797956&r2=1797957&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Wed Jun 7 15:46:40 2017
@@ -379,10 +379,8 @@ final class FileSystemFontProvider exten
}
if (fileExists)
{
- BufferedReader reader = null;
- try
+ try (BufferedReader reader = new BufferedReader(new FileReader(file)))
{
- reader = new BufferedReader(new FileReader(file));
String line;
while ((line = reader.readLine()) != null)
{
@@ -449,10 +447,6 @@ final class FileSystemFontProvider exten
LOG.error("Error loading font cache, will be re-built", e);
return null;
}
- finally
- {
- IOUtils.closeQuietly(reader);
- }
}
if (pending.size() > 0)
@@ -712,10 +706,8 @@ final class FileSystemFontProvider exten
private Type1Font getType1Font(String postScriptName, File file)
{
- InputStream input = null;
- try
+ try (InputStream input = new FileInputStream(file))
{
- input = new FileInputStream(file);
Type1Font type1 = Type1Font.createWithPFB(input);
if (LOG.isDebugEnabled())
@@ -728,10 +720,6 @@ final class FileSystemFontProvider exten
{
LOG.error("Could not load font file: " + file, e);
}
- finally
- {
- IOUtils.closeQuietly(input);
- }
return null;
}