Index: xjc/src/com/sun/tools/xjc/reader/internalizer/DOMForest.java
===================================================================
RCS file: /cvs/jaxb2-sources/jaxb-ri/xjc/src/com/sun/tools/xjc/reader/internalizer/DOMForest.java,v
retrieving revision 1.15
diff -u -r1.15 DOMForest.java
--- xjc/src/com/sun/tools/xjc/reader/internalizer/DOMForest.java	15 Mar 2006 22:20:21 -0000	1.15
+++ xjc/src/com/sun/tools/xjc/reader/internalizer/DOMForest.java	17 Sep 2007 04:04:08 -0000
@@ -176,6 +176,18 @@
             }
         }
 
+        if (doc == null && systemId.startsWith("file:")) {
+           // Spaces in the path may have been replaced with %20.
+           // perform search based on this case.
+           String systemPath = getPath(systemId).replace(" ", "%20");
+           for (String key : core.keySet()) {
+              if (key.startsWith("file:") && getPath(key).equalsIgnoreCase(systemPath)) {
+                 doc = core.get(key);
+                 break;
+              }
+           }
+        }
+        
         return doc;
     }