Merge jdk8u40-b02

Thu, 14 Aug 2014 13:23:33 -0700

author
lana
date
Thu, 14 Aug 2014 13:23:33 -0700
changeset 772
16ef2134c32a
parent 770
fa4eac73c755
parent 771
e289e62fb3ea
child 773
d73144ee471d

Merge

     1.1 --- a/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Wed Aug 13 14:49:49 2014 -0700
     1.2 +++ b/src/com/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java	Thu Aug 14 13:23:33 2014 -0700
     1.3 @@ -3145,7 +3145,11 @@
     1.4                                    m_data.elementAt(-dataIndex+1));
     1.5        }
     1.6      }
     1.7 -    else if (DTM.ELEMENT_NODE == type || DTM.DOCUMENT_FRAGMENT_NODE == type
     1.8 +    else if (DTM.ELEMENT_NODE == type)
     1.9 +    {
    1.10 +      return getStringValueX(nodeHandle);
    1.11 +    }
    1.12 +    else if (DTM.DOCUMENT_FRAGMENT_NODE == type
    1.13               || DTM.DOCUMENT_NODE == type)
    1.14      {
    1.15        return null;

mercurial