Fixing 10 of the XPath failures caused by a malformed Document.

See bug 2518858.

This makes our XPath implementation fail the exact same tests
as the RI's. (which we assume is also based on Apache Xalan)

Change-Id: I9a98323113c95609651e948ad11113f84ccd87ec

1 files changed, 4 insertions, 4 deletions

diff --git a/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java b/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
index f3956f8..8bce9aa 100644
--- a/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
+++ b/xml/src/main/java/org/apache/harmony/xml/parsers/DocumentBuilderImpl.java
@@ -257,11 +257,11 @@ class DocumentBuilderImpl extends DocumentBuilder {
                 }
             } else if (token == XmlPullParser.IGNORABLE_WHITESPACE) {
                 /*
-                 * Found some ignorable whitespace. We simply take the token
-                 * text, but we only create a node if the client wants to see
-                 * whitespace at all.
+                 * Found some ignorable whitespace. We only add it if the client
+                 * wants to see whitespace. Whitespace before and after the
+                 * document element is always ignored.
                  */
-                if (!ignoreElementContentWhitespace) {
+                if (!ignoreElementContentWhitespace && document != node) {
                     appendText(document, node, token, parser.getText());
                 }
             } else if (token == XmlPullParser.TEXT || token == XmlPullParser.CDSECT) {