You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by ta...@apache.org on 2016/10/28 13:48:26 UTC

tika git commit: TIKA-2144 - avoid npe if styles doesn't exist (odd, indeed, but if MSWord can handle it, we should, too).

Repository: tika
Updated Branches:
  refs/heads/2.x 936e3ac16 -> 4b393a6f9


TIKA-2144 - avoid npe if styles doesn't exist (odd, indeed, but if MSWord can handle it, we should, too).


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

Branch: refs/heads/2.x
Commit: 4b393a6f9be5ed492ce4408ff12971bef82b4a14
Parents: 936e3ac
Author: tballison <ta...@mitre.org>
Authored: Fri Oct 28 09:48:20 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Fri Oct 28 09:48:20 2016 -0400

----------------------------------------------------------------------
 .../tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tika/blob/4b393a6f/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
----------------------------------------------------------------------
diff --git a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
index 3a15d58..408a591 100644
--- a/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
+++ b/tika-parser-modules/tika-parser-office-module/src/main/java/org/apache/tika/parser/microsoft/ooxml/XWPFWordExtractorDecorator.java
@@ -145,7 +145,8 @@ public class XWPFWordExtractorDecorator extends AbstractOOXMLExtractor {
         // Is this a paragraph, or a heading?
         String tag = "p";
         String styleClass = null;
-        if (paragraph.getStyleID() != null) {
+        //TIKA-2144 check that styles is not null
+        if (paragraph.getStyleID() != null && styles != null) {
             XWPFStyle style = styles.getStyle(
                     paragraph.getStyleID()
             );