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/19 23:23:20 UTC
[1/2] tika git commit: TIKA-2127 : npe if there is no notes master
Repository: tika
Updated Branches:
refs/heads/master 687d7706c -> f19be22ba
TIKA-2127 : npe if there is no notes master
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/b3f1497c
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/b3f1497c
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/b3f1497c
Branch: refs/heads/master
Commit: b3f1497caaafa1b53295d87592329f8d7cbca38b
Parents: 02425b2
Author: tballison <ta...@mitre.org>
Authored: Wed Oct 19 19:22:53 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Wed Oct 19 19:22:53 2016 -0400
----------------------------------------------------------------------
.../parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tika/blob/b3f1497c/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
----------------------------------------------------------------------
diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
index 160f761..0bf0ad3 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/microsoft/ooxml/XSLFPowerPointExtractorDecorator.java
@@ -90,7 +90,9 @@ public class XSLFPowerPointExtractorDecorator extends AbstractOOXMLExtractor {
// master sheet for this notes
XSLFNotesMaster notesMaster = slideNotes.getMasterSheet();
- extractContent(notesMaster.getShapes(), true, xhtml, null);
+ if (notesMaster != null) {
+ extractContent(notesMaster.getShapes(), true, xhtml, null);
+ }
xhtml.endElement("div");
}
[2/2] tika git commit: Merge remote-tracking branch 'origin/master'
Posted by ta...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/tika/repo
Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/f19be22b
Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/f19be22b
Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/f19be22b
Branch: refs/heads/master
Commit: f19be22ba6439f9f639d8fac06287c9d4fd8a19b
Parents: b3f1497 687d770
Author: tballison <ta...@mitre.org>
Authored: Wed Oct 19 19:23:15 2016 -0400
Committer: tballison <ta...@mitre.org>
Committed: Wed Oct 19 19:23:15 2016 -0400
----------------------------------------------------------------------
CHANGES.txt | 2 +-
pom.xml | 2 +-
tika-app/pom.xml | 2 +-
tika-batch/pom.xml | 2 +-
tika-bundle/pom.xml | 2 +-
tika-core/pom.xml | 2 +-
tika-example/pom.xml | 2 +-
tika-java7/pom.xml | 2 +-
tika-langdetect/pom.xml | 2 +-
tika-parent/pom.xml | 2 +-
tika-parsers/pom.xml | 2 +-
tika-serialization/pom.xml | 2 +-
tika-server/pom.xml | 2 +-
tika-translate/pom.xml | 2 +-
tika-xmp/pom.xml | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------