svn commit: r1100015 - /tika/trunk/tika-core/src/main/java/org/apache/tika/io/TikaInputStream.java

[ni...@apache.org]

Author: nick
Date: Fri May  6 01:22:12 2011
New Revision: 1100015

URL: http://svn.apache.org/viewvc?rev=1100015&view=rev
Log:
TIKA-654 - If we have an open container that can be closed, close it when closing the stream

Modified:
    tika/trunk/tika-core/src/main/java/org/apache/tika/io/TikaInputStream.java

Modified: tika/trunk/tika-core/src/main/java/org/apache/tika/io/TikaInputStream.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/java/org/apache/tika/io/TikaInputStream.java?rev=1100015&r1=1100014&r2=1100015&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/java/org/apache/tika/io/TikaInputStream.java (original)
+++ tika/trunk/tika-core/src/main/java/org/apache/tika/io/TikaInputStream.java Fri May  6 01:22:12 2011
@@ -18,6 +18,7 @@ package org.apache.tika.io;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;
+import java.io.Closeable;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -604,7 +605,12 @@ public class TikaInputStream extends Pro
             in.close();
             in = null;
         }
-        openContainer = null;
+        if (openContainer != null) {
+           if (openContainer instanceof Closeable) {
+              ((Closeable)openContainer).close();
+           }
+           openContainer = null;
+        }
         file = null;
         tmp.dispose();
     }