You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ma...@apache.org on 2011/09/21 12:36:09 UTC
svn commit: r1173562 -
/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
Author: maxcom
Date: Wed Sep 21 10:36:09 2011
New Revision: 1173562
URL: http://svn.apache.org/viewvc?rev=1173562&view=rev
Log:
TIKA-726: throw EncryptedDocumentException in ExcelExtractor
Modified:
tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java?rev=1173562&r1=1173561&r2=1173562&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ExcelExtractor.java Wed Sep 21 10:36:09 2011
@@ -60,6 +60,7 @@ import org.apache.poi.poifs.filesystem.D
import org.apache.poi.poifs.filesystem.DocumentInputStream;
import org.apache.poi.poifs.filesystem.Entry;
import org.apache.poi.poifs.filesystem.NPOIFSFileSystem;
+import org.apache.tika.exception.EncryptedDocumentException;
import org.apache.tika.exception.TikaException;
import org.apache.tika.io.TikaInputStream;
import org.apache.tika.parser.ParseContext;
@@ -273,7 +274,11 @@ public class ExcelExtractor extends Abst
// Create event factory and process Workbook (fire events)
DocumentInputStream documentInputStream = filesystem.createDocumentInputStream("Workbook");
HSSFEventFactory eventFactory = new HSSFEventFactory();
- eventFactory.processEvents(hssfRequest, documentInputStream);
+ try {
+ eventFactory.processEvents(hssfRequest, documentInputStream);
+ } catch (org.apache.poi.EncryptedDocumentException e) {
+ throw new EncryptedDocumentException(e);
+ }
// Output any extra text that came after all the sheets
processExtraText();