2 files changed, 20 insertions, 2 deletions
diff --git a/libjava/classpath/gnu/xml/stream/SAXParser.java b/libjava/classpath/gnu/xml/stream/SAXParser.java
index 1329ab2971c..af4a6af4217 100644
--- a/libjava/classpath/gnu/xml/stream/SAXParser.java
+++ b/libjava/classpath/gnu/xml/stream/SAXParser.java
@@ -1,5 +1,5 @@
 /* SAXParser.java -- 
-   Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -187,6 +187,8 @@ public class SAXParser
       lexicalHandler = (LexicalHandler) value;
     else if ((GNU_FEATURES + "xml-base").equals(name))
       baseAware = Boolean.TRUE.equals(value);
+    else if ((GNU_FEATURES + "coalescing").equals(name))
+      coalescing = Boolean.TRUE.equals(value);
     else
       throw new SAXNotSupportedException(name);
   }
diff --git a/libjava/classpath/gnu/xml/stream/XMLParser.java b/libjava/classpath/gnu/xml/stream/XMLParser.java
index 663a300f88c..fae4afec808 100644
--- a/libjava/classpath/gnu/xml/stream/XMLParser.java
+++ b/libjava/classpath/gnu/xml/stream/XMLParser.java
@@ -439,6 +439,7 @@ public class XMLParser
             throw e2;
           }
       }
+    systemId = canonicalize(systemId);
     pushInput(new Input(in, null, null, systemId, null, null, false, true));
   }
 
@@ -513,6 +514,7 @@ public class XMLParser
             throw e2;
           }
       }
+    systemId = canonicalize(systemId);
     pushInput(new Input(null, reader, null, systemId, null, null, false, true));
   }
 
@@ -1540,7 +1542,7 @@ public class XMLParser
   {
     if (!externalEntities)
       return;
-    String url = absolutize(input.systemId, ids.systemId);
+    String url = canonicalize(absolutize(input.systemId, ids.systemId));
     // Check for recursion
     for (Iterator i = inputStack.iterator(); i.hasNext(); )
       {
@@ -1587,6 +1589,20 @@ public class XMLParser
   }
 
   /**
+   * Returns a canonicalized version of the specified URL.
+   * This is largely to work around a problem with the specification of
+   * file URLs.
+   */
+  static String canonicalize(String url)
+  {
+    if (url == null)
+      return null;
+    if (url.startsWith("file:") && !url.startsWith("file://"))
+      url = "file://" + url.substring(5);
+    return url;
+  }
+
+  /**
    * "Absolutize" a URL. This resolves a relative URL into an absolute one.
    * @param base the current base URL
    * @param href the (absolute or relative) URL to resolve