svn commit: r1937619 - pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf

[tilman]

Author: tilman
Date: Sat Aug 29 14:23:40 2026
New Revision: 1937619

Log:
PDFBOX-5660: DRY refactoring

Modified:
   
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java

Modified: 
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java
==============================================================================
--- 
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java 
    Sat Aug 29 14:23:37 2026        (r1937618)
+++ 
pdfbox/branches/3.0/fontbox/src/main/java/org/apache/fontbox/ttf/TTFParser.java 
    Sat Aug 29 14:23:40 2026        (r1937619)
@@ -16,6 +16,7 @@
  */
 package org.apache.fontbox.ttf;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import org.apache.commons.logging.Log;
@@ -60,21 +61,7 @@ public class TTFParser
      */
     public TrueTypeFont parse(RandomAccessRead randomAccessRead) throws 
IOException
     {
-        RandomAccessReadDataStream dataStream = new 
RandomAccessReadDataStream(randomAccessRead);
-        try
-        {
-            return parse(dataStream);
-        }
-        catch (IOException ex)
-        {
-            // close only on error (source is still being accessed later)
-            dataStream.close();
-            throw ex;
-        }
-        finally
-        {
-            randomAccessRead.close();
-        }
+        return parse(randomAccessRead, new 
RandomAccessReadDataStream(randomAccessRead));
     }
 
     /**
@@ -87,7 +74,12 @@ public class TTFParser
     public TrueTypeFont parseEmbedded(InputStream inputStream) throws 
IOException
     {
         this.isEmbedded = true;
-        RandomAccessReadDataStream dataStream = new 
RandomAccessReadDataStream(inputStream);
+        return parse(inputStream, new RandomAccessReadDataStream(inputStream));
+    }
+
+    private TrueTypeFont parse(Closeable inputStream, 
RandomAccessReadDataStream dataStream)
+            throws IOException
+    {
         try
         {
             return parse(dataStream);