# HG changeset patch
# User aefimov
# Date 1433087698 -10800
# Node ID e3e97df49dcbaed33b74ab5ffd3241c0983000c5
# Parent  834a39f903fd77d657af703bba289e16883a680e
8081392, PR2674: getNodeValue should return 'null' value for Element nodes
Reviewed-by: joehw

diff -r 834a39f903fd -r e3e97df49dcb src/com/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java
--- 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();
     }
 
      /**
diff -r 834a39f903fd -r e3e97df49dcb src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java
--- 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;