TIKA-4220 -- temporary workaround for tar detection regression in com…

…mons-compress
apache · Mar 25, 2024 · 01d97ea · 01d97ea
1 parent ea5ae24
commit 01d97ea
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/...odules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java b/...odules/tika-parser-pkg-module/src/main/java/org/apache/tika/parser/pkg/PackageParser.java
@@ -253,6 +253,16 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
         }
 
         TemporaryResources tmp = new TemporaryResources();
+        try {
+            _parse(stream, handler, metadata, context, tmp);
+        } finally {
+            tmp.close();
+        }
+    }
+
+    private void _parse(InputStream stream, ContentHandler handler, Metadata metadata,
+                ParseContext context, TemporaryResources tmp)
+            throws TikaException, IOException, SAXException {
         ArchiveInputStream ais = null;
         String encoding = null;
         try {
@@ -304,11 +314,9 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
                 // Pending a fix for COMPRESS-269 / TIKA-1525, this bit is a little nasty
                 ais = new SevenZWrapper(sevenz);
             } else {
-                tmp.close();
                 throw new TikaException("Unknown non-streaming format " + sne.getFormat(), sne);
             }
         } catch (ArchiveException e) {
-            tmp.close();
             throw new TikaException("Unable to unpack document stream", e);
         }
 
@@ -340,7 +348,6 @@ public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
             }
         } finally {
             ais.close();
-            tmp.close();
             xhtml.endDocument();
         }
     }