TIKA-1935

Author: tballison

tika-parsers/src/main/java/org/apache/tika/parser/isatab/ISArchiveParser.java

@@ -24,6 +24,7 @@
 import java.util.Set;
 
 import org.apache.tika.exception.TikaException;
+import org.apache.tika.io.TemporaryResources;
 import org.apache.tika.io.TikaInputStream;
 import org.apache.tika.metadata.Metadata;
 import org.apache.tika.mime.MediaType;
@@ -75,29 +76,38 @@ public Set<MediaType> getSupportedTypes(ParseContext context) {
 	public void parse(InputStream stream, ContentHandler handler, Metadata metadata,
 			ParseContext context) throws IOException, SAXException, TikaException {
 
-		TikaInputStream tis = TikaInputStream.get(stream);
-		if (this.location == null) {
-			this.location = tis.getFile().getParent() + File.separator;
-		}
-		this.studyFileName = tis.getFile().getName();
-		 
-		File locationFile = new File(location);
-		String[] investigationList = locationFile.list(new FilenameFilter() {
-			
-			@Override
-			public boolean accept(File dir, String name) {
-				return name.matches("i_.+\\.txt");
+		TemporaryResources tmp = TikaInputStream.isTikaInputStream(stream) ? null :
+				new TemporaryResources();
+
+		TikaInputStream tis = TikaInputStream.get(stream, tmp);
+		try {
+			if (this.location == null) {
+				this.location = tis.getFile().getParent() + File.separator;
 			}
-		});	
-		
-		XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
-		xhtml.startDocument();
-		
-		parseInvestigation(investigationList, xhtml, metadata, context);
-		parseStudy(stream, xhtml, metadata, context);
-		parseAssay(xhtml, metadata, context);
-		
-		xhtml.endDocument();
+			this.studyFileName = tis.getFile().getName();
+
+			File locationFile = new File(location);
+			String[] investigationList = locationFile.list(new FilenameFilter() {
+
+				@Override
+				public boolean accept(File dir, String name) {
+					return name.matches("i_.+\\.txt");
+				}
+			});
+
+			XHTMLContentHandler xhtml = new XHTMLContentHandler(handler, metadata);
+			xhtml.startDocument();
+
+			parseInvestigation(investigationList, xhtml, metadata, context);
+			parseStudy(stream, xhtml, metadata, context);
+			parseAssay(xhtml, metadata, context);
+
+			xhtml.endDocument();
+		} finally {
+			if (tmp != null) {
+				tmp.dispose();
+			}
+		}
 	}
 
 	private void parseInvestigation(String[] investigationList, XHTMLContentHandler xhtml, Metadata metadata, ParseContext context) throws IOException, SAXException, TikaException {