[tika] branch main updated: TIKA-3088 - fix NPE in OpenDocumentContentParser caused by com.sun.org.apache.xml.internal.serializer.ToHTMLStream

[tallison]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 44a30b3  TIKA-3088 - fix NPE in OpenDocumentContentParser caused by 
com.sun.org.apache.xml.internal.serializer.ToHTMLStream
44a30b3 is described below

commit 44a30b3b7985415cf315f6354b37961bf90e7b49
Author: tallison <talli...@apache.org>
AuthorDate: Thu Jul 16 10:12:04 2020 -0400

    TIKA-3088 - fix NPE in OpenDocumentContentParser caused by 
com.sun.org.apache.xml.internal.serializer.ToHTMLStream
---
 .../java/org/apache/tika/parser/odf/OpenDocumentContentParser.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
 
b/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
index 066f3e9..2e40c68 100644
--- 
a/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
+++ 
b/tika-parsers/src/main/java/org/apache/tika/parser/odf/OpenDocumentContentParser.java
@@ -411,7 +411,7 @@ public class OpenDocumentContentParser extends 
AbstractParser {
                 // to incoming handler
                 if (TEXT_NS.equals(namespaceURI) && "h".equals(localName)) {
                     final String el = headingStack.pop();
-                    handler.endElement(XHTMLContentHandler.XHTML, el, el);
+                    handler.endElement(namespaceURI, el, el);
                 } else if (TEXT_NS.equals(namespaceURI) && 
"list".equals(localName)) {
                     endList();
                 } else if (TEXT_NS.equals(namespaceURI) && 
"span".equals(localName)) {
@@ -422,7 +422,7 @@ public class OpenDocumentContentParser extends 
AbstractParser {
                 } else if ("annotation".equals(localName) || 
"note".equals(localName) ||
                         "notes".equals(localName)) {
                         closeStyleTags();
-                        handler.endElement("", localName, localName);
+                        handler.endElement(namespaceURI, localName, localName);
                 } else {
                     super.endElement(namespaceURI, localName, qName);
                 }