stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8081392: getNodeValue should return 'null' value for Element nodes

Browse Source 
Reviewed-by: joehw
This commit is contained in:
Aleksei Efimov 2015-05-29 12:28:40 +03:00
parent 63dc40184a
commit 38bcbb873f
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
View File

@ -2116,7 +2116,7 @@ public class DTMNodeProxy
*/ */
@Override @Override
public String getTextContent() throws DOMException { public String getTextContent() throws DOMException {
return getNodeValue(); // overriden in some subclasses return dtm.getStringValue(node).toString();
} }
/** /**

6
jaxp/src/java.xml/share/classes/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
View File

@ -3145,11 +3145,7 @@ public class SAX2DTM2 extends SAX2DTM
m_data.elementAt(-dataIndex+1)); m_data.elementAt(-dataIndex+1));
} }
} }
else if (DTM.ELEMENT_NODE == type) else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
{
return getStringValueX(nodeHandle);
}
else if (DTM.DOCUMENT_FRAGMENT_NODE == type
|| DTM.DOCUMENT_NODE == type) || DTM.DOCUMENT_NODE == type)
{ {
return null; return null;

2
jaxp/test/javax/xml/jaxp/unittest/javax/xml/transform/DocumentExtFunc.java
View File

@ -30,6 +30,6 @@ public class DocumentExtFunc {
public static String test(NodeList list) { public static String test(NodeList list) {
Node node = list.item(0); Node node = list.item(0);
return "["+node.getNodeName() + ":" + node.getNodeValue()+"]"; return "["+node.getNodeName() + ":" + node.getTextContent()+"]";
} }
} }