diff options
| author | aefimov <none@none> | 2015-05-31 18:54:58 +0300 |
|---|---|---|
| committer | aefimov <none@none> | 2015-05-31 18:54:58 +0300 |
| commit | d4afe33bb7042f748e082ca436d6dd1586f6bb49 (patch) | |
| tree | c343888240e44c5ed2d03c6140854972c3d51675 /src | |
| parent | 130f0b653652a44fb746a40d14cdb433acd6e778 (diff) | |
| download | jdk8u_jaxp-d4afe33bb7042f748e082ca436d6dd1586f6bb49.tar.gz | |
8081392: getNodeValue should return 'null' value for Element nodes
Reviewed-by: joehw
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java | 2 | ||||
| -rw-r--r-- | src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java index d9ca5b0..5fdf653 100644 --- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java @@ -2116,7 +2116,7 @@ public class DTMNodeProxy */ @Override public String getTextContent() throws DOMException { - return getNodeValue(); // overriden in some subclasses + return dtm.getStringValue(node).toString(); } /** diff --git a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java index ea0e9b7..526f5e1 100644 --- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java @@ -3145,11 +3145,7 @@ public class SAX2DTM2 extends SAX2DTM m_data.elementAt(-dataIndex+1)); } } - else if (DTM.ELEMENT_NODE == type) - { - return getStringValueX(nodeHandle); - } - else if (DTM.DOCUMENT_FRAGMENT_NODE == type + else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type || DTM.DOCUMENT_NODE == type) { return null; |