svn commit: r1448814 - in /tika/trunk: tika-app/src/main/java/org/apache/tika/cli/ tika-parsers/src/main/java/org/apache/tika/parser/microsoft/

[mikemccand]

Author: mikemccand
Date: Thu Feb 21 21:38:35 2013
New Revision: 1448814

URL: http://svn.apache.org/r1448814
Log:
TIKA-1074: catch Exception not Throwable, and restore interrupt bit for 
InterruptedExc

Modified:
    tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
    
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java

Modified: tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java?rev=1448814&r1=1448813&r2=1448814&view=diff
==============================================================================
--- tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java 
(original)
+++ tika/trunk/tika-app/src/main/java/org/apache/tika/cli/TikaCLI.java Thu Feb 
21 21:38:35 2013
@@ -739,8 +739,11 @@ public class TikaCLI {
                 } else {
                     IOUtils.copy(inputStream, os);
                 }
-            } catch (Throwable t) {
-                logger.warn("Ignoring unexpected exception trying to save 
embedded file " + name, t);
+            } catch (Exception e) {
+                logger.warn("Ignoring unexpected exception trying to save 
embedded file " + name, e);
+                if (e instanceof InterruptedException) {
+                    Thread.currentThread().interrupt();
+                }
             } finally {
                 if (os != null) {
                     os.close();

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java?rev=1448814&r1=1448813&r2=1448814&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
 (original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/AbstractPOIFSExtractor.java
 Thu Feb 21 21:38:35 2013
@@ -155,8 +155,11 @@ abstract class AbstractPOIFSExtractor {
                     embedded = TikaInputStream.get(data);
                 } catch (Ole10NativeException ex) {
                     // Not a valid OLE10Native record, skip it
-                } catch (Throwable t) {
-                    logger.warn("Ignoring unexpected exception while parsing 
possible OLE10_NATIVE embedded document " + dir.getName(), t);
+                } catch (Exception e) {
+                    logger.warn("Ignoring unexpected exception while parsing 
possible OLE10_NATIVE embedded document " + dir.getName(), e);
+                    if (e instanceof InterruptedException) {
+                        Thread.currentThread().interrupt();
+                    }
                 }
             } else if (type == POIFSDocumentType.COMP_OBJ) {
                 try {

Modified: 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
URL: 
http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java?rev=1448814&r1=1448813&r2=1448814&view=diff
==============================================================================
--- 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
 (original)
+++ 
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/SummaryExtractor.java
 Thu Feb 21 21:38:35 2013
@@ -95,8 +95,11 @@ class SummaryExtractor {
             throw new TikaException("Unexpected HPSF document", e);
         } catch (MarkUnsupportedException e) {
             throw new TikaException("Invalid DocumentInputStream", e);
-        } catch (Throwable t) {
-            logger.warn("Ignoring unexpected exception while parsing summary 
entry " + entryName, t);
+        } catch (Exception e) {
+            logger.warn("Ignoring unexpected exception while parsing summary 
entry " + entryName, e);
+            if (e instanceof InterruptedException) {
+                Thread.currentThread().interrupt();
+            }
         }
     }