[tika] branch branch_1x updated: TIKA-3244 upgrade jackcess with upgrade to most recent jackcess-crypt; fix npe while at it.

[ta...@apache.org]

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

tallison 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 3776e48  TIKA-3244 upgrade jackcess with upgrade to most recent jackcess-crypt; fix npe while at it.
     new 2550aac  Merge remote-tracking branch 'origin/branch_1x' into branch_1x
3776e48 is described below

commit 3776e48be9f83ace0a9a66b980248999ce22294a
Author: tballison <ta...@apache.org>
AuthorDate: Fri Mar 5 13:25:59 2021 -0500

    TIKA-3244 upgrade jackcess with upgrade to most recent jackcess-crypt; fix npe while at it.
---
 tika-parsers/pom.xml                                                  | 4 ++--
 .../main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java | 3 +++
 .../main/java/org/apache/tika/parser/microsoft/JackcessParser.java    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tika-parsers/pom.xml b/tika-parsers/pom.xml
index fa5e6f0..8612f0a 100644
--- a/tika-parsers/pom.xml
+++ b/tika-parsers/pom.xml
@@ -269,7 +269,7 @@
     <dependency>
       <groupId>com.healthmarketscience.jackcess</groupId>
       <artifactId>jackcess</artifactId>
-      <version>3.5.1</version>
+      <version>4.0.0</version>
       <exclusions>
         <exclusion>
           <groupId>org.apache.commons</groupId>
@@ -284,7 +284,7 @@
     <dependency>
       <groupId>com.healthmarketscience.jackcess</groupId>
       <artifactId>jackcess-encrypt</artifactId>
-      <version>3.0.0</version>
+      <version>4.0.1</version>
       <exclusions>
         <exclusion>
           <groupId>org.bouncycastle</groupId>
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
index 1ae4ab8..24e58d4 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessExtractor.java
@@ -147,6 +147,9 @@ class JackcessExtractor extends AbstractPOIFSExtractor {
 
         while (it.hasNext()) {
             Table table = it.next();
+            if (table == null) {
+                break;
+            }
             String tableName = table.getName();
             List<? extends Column> columns = table.getColumns();
             xhtml.startElement("table", "name", tableName);
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
index 5daf678..dd1a05b 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/JackcessParser.java
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.Locale;
 import java.util.Set;
 
-import com.healthmarketscience.jackcess.CryptCodecProvider;
+import com.healthmarketscience.jackcess.crypt.CryptCodecProvider;
 import com.healthmarketscience.jackcess.Database;
 import com.healthmarketscience.jackcess.DatabaseBuilder;
 import com.healthmarketscience.jackcess.DateTimeType;