Mercurial > hg > icedtea7-forest > jaxp
changeset 1357:e3e97df49dcb
8081392, PR2674: getNodeValue should return 'null' value for Element nodes
Reviewed-by: joehw
| author | aefimov |
|---|---|
| date | Sun, 31 May 2015 18:54:58 +0300 |
| parents | 834a39f903fd |
| children | 3cc8e02e66bc |
| files | src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java |
| diffstat | 2 files changed, 2 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Mon May 11 12:48:57 2015 +0300 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java Sun May 31 18:54:58 2015 +0300 @@ -2116,7 +2116,7 @@ */ @Override public String getTextContent() throws DOMException { - return getNodeValue(); // overriden in some subclasses + return dtm.getStringValue(node).toString(); } /**
--- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Mon May 11 12:48:57 2015 +0300 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java Sun May 31 18:54:58 2015 +0300 @@ -3145,11 +3145,7 @@ 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;