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/06/22 13:40:18 UTC

svn commit: r1138411 - /tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java

Author: maxcom
Date: Wed Jun 22 11:40:18 2011
New Revision: 1138411

URL: http://svn.apache.org/viewvc?rev=1138411&view=rev
Log:
OfficeParser: choose correct Decryptor for document

Modified:
    tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java

Modified: tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java?rev=1138411&r1=1138410&r2=1138411&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java (original)
+++ tika/trunk/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/OfficeParser.java Wed Jun 22 11:40:18 2011
@@ -28,7 +28,6 @@ import java.util.Set;
 import org.apache.poi.hdgf.extractor.VisioTextExtractor;
 import org.apache.poi.hpbf.extractor.PublisherTextExtractor;
 import org.apache.poi.poifs.crypt.Decryptor;
-import org.apache.poi.poifs.crypt.EcmaDecryptor;
 import org.apache.poi.poifs.crypt.EncryptionInfo;
 import org.apache.poi.poifs.filesystem.DirectoryEntry;
 import org.apache.poi.poifs.filesystem.Entry;
@@ -224,7 +223,7 @@ public class OfficeParser extends Abstra
                     break;
                 case ENCRYPTED:
                     EncryptionInfo info = new EncryptionInfo(filesystem);
-                    Decryptor d = new EcmaDecryptor(info);
+                    Decryptor d = Decryptor.getInstance(info);
 
                     try {
                         if (!d.verifyPassword(Decryptor.DEFAULT_PASSWORD)) {