tika git commit: TIKA-2198 - add null check to Tika after upgrade to POI 3.16.beta2

2017-02-06 Thread tallison
Repository: tika
Updated Branches:
  refs/heads/master 0d54f07fa -> bc3b26369


TIKA-2198 - add null check to Tika after upgrade to POI 3.16.beta2


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/bc3b2636
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/bc3b2636
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/bc3b2636

Branch: refs/heads/master
Commit: bc3b26369ffbeff83a6e27f57a564089661e5030
Parents: 0d54f07
Author: tballison 
Authored: Mon Feb 6 10:27:41 2017 -0500
Committer: tballison 
Committed: Mon Feb 6 10:27:41 2017 -0500

--
 .../main/java/org/apache/tika/parser/microsoft/ListManager.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tika/blob/bc3b2636/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
--
diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ListManager.java 
b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
index a0f19e1..504573c 100644
--- 
a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
+++ 
b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
@@ -81,6 +81,10 @@ public class ListManager extends AbstractListManager {
 
 if (lc == null) {
 ListData listData = 
listTables.getListData(paragraph.getList().getLsid());
+if (listData == null) {
+//silently skip
+return "";
+}
 LevelTuple[] levelTuples = new 
LevelTuple[listData.getLevels().length];
 for (int i = 0; i < listData.getLevels().length; i++) {
 levelTuples[i] = buildTuple(i, listData.getLevels()[i]);



tika git commit: TIKA-2198 - add null check to Tika after upgrade to POI 3.16-beta2

2017-02-06 Thread tallison
Repository: tika
Updated Branches:
  refs/heads/2.x 27e81b97a -> 0d7f5bad0


TIKA-2198 - add null check to Tika after upgrade to POI 3.16-beta2


Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/0d7f5bad
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/0d7f5bad
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/0d7f5bad

Branch: refs/heads/2.x
Commit: 0d7f5bad0ff61b14a1fad7816e109e1190b17bab
Parents: 27e81b9
Author: tballison 
Authored: Mon Feb 6 10:29:37 2017 -0500
Committer: tballison 
Committed: Mon Feb 6 10:29:37 2017 -0500

--
 .../main/java/org/apache/tika/parser/microsoft/ListManager.java  | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/tika/blob/0d7f5bad/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
--
diff --git 
a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
 
b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
index a0f19e1..504573c 100644
--- 
a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
+++ 
b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ListManager.java
@@ -81,6 +81,10 @@ public class ListManager extends AbstractListManager {
 
 if (lc == null) {
 ListData listData = 
listTables.getListData(paragraph.getList().getLsid());
+if (listData == null) {
+//silently skip
+return "";
+}
 LevelTuple[] levelTuples = new 
LevelTuple[listData.getLevels().length];
 for (int i = 0; i < listData.getLevels().length; i++) {
 levelTuples[i] = buildTuple(i, listData.getLevels()[i]);