[tika] branch branch_1x updated: TIKA-2546: upgrade to java-libpst 0.9.3

[lfcnassif]

This is an automated email from the ASF dual-hosted git repository.

lfcnassif pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_1x by this push:
     new 2743532  TIKA-2546: upgrade to java-libpst 0.9.3
2743532 is described below

commit 274353268154784eccb3452c0859194fd54f15d4
Author: Nassif <nassif.l...@dpf.gov.br>
AuthorDate: Wed Dec 4 16:47:05 2019 -0200

    TIKA-2546: upgrade to java-libpst 0.9.3
---
 CHANGES.txt                                                      | 2 ++
 tika-parsers/pom.xml                                             | 4 +---
 .../main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java  | 9 ++++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index ad36ac1..8fb14c8 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,8 @@
 Release 1.24 - ???
 
    * Fix bug in ASM parser configuration (TIKA-2992).
+   
+   * Upgrade to java-libpst 0.9.3 (TIKA-2546).
 
 Release 1.23 - 12/02/2019
 
diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index 2c4b046..4082969 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -355,12 +355,10 @@
         </exclusion>
       </exclusions>
     </dependency>
-    <!-- can't upgrade to java-libpst 0.9.3 because it requires Java 8
-         and is buggy with OST TIKA-2415 -->
     <dependency>
       <groupId>com.pff</groupId>
       <artifactId>java-libpst</artifactId>
-      <version>0.8.1</version>
+      <version>0.9.3</version>
     </dependency>
     <dependency>
       <groupId>com.github.junrar</groupId>
diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java 
b/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java
index 52df5fc..951ee25 100644
--- 
a/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java
+++ 
b/tika-parsers/src/main/java/org/apache/tika/parser/mbox/OutlookPSTParser.java
@@ -87,11 +87,18 @@ public class OutlookPSTParser extends AbstractParser {
             metadata.set(Metadata.CONTENT_LENGTH, 
valueOf(pstFile.getFileHandle().length()));
             boolean isValid = pstFile.getFileHandle().getFD().valid();
             metadata.set("isValid", valueOf(isValid));
+            if(pstFile.getPSTFileType() == PSTFile.PST_TYPE_2013_UNICODE) {
+                throw new TikaException("OST 2013 support not added yet. It 
will be when https://github.com/rjohnsondev/java-libpst/issues/60 is fixed.");
+            }
             if (isValid) {
                 parseFolder(xhtml, pstFile.getRootFolder(), embeddedExtractor);
             }
         } catch (Exception e) {
-            throw new TikaException(e.getMessage(), e);
+            if(e instanceof TikaException) {
+                throw (TikaException) e;
+            }else {
+                throw new TikaException(e.getMessage(), e);
+            }
         } finally {
             if (pstFile != null && pstFile.getFileHandle() != null) {
                 try {