Mercurial > hg > jdk9-shenandoah > jaxp

changeset 741:b5b21a17c24e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
8081392: getNodeValue should return 'null' value for Element nodes Reviewed-by: joehw
author aefimov
date Fri, 29 May 2015 12:28:40 +0300
parents 78c2685daaba
children e18204c4e064
files src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
diffstat 3 files changed, 3 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java	Thu May 28 16:13:51 2015 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java	Fri May 29 12:28:40 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/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Thu May 28 16:13:51 2015 -0700
+++ b/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Fri May 29 12:28:40 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;
--- a/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java	Thu May 28 16:13:51 2015 -0700
+++ b/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java	Fri May 29 12:28:40 2015 +0300
@@ -30,6 +30,6 @@
 
     public static String test(NodeList list) {
         Node node = list.item(0);
-        return "["+node.getNodeName() + ":" + node.getNodeValue()+"]";
+        return "["+node.getNodeName() + ":" + node.getTextContent()+"]";
     }
 }