svn commit: r949234 - /xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java

[mr...@apache.org]

Author: mrglavas
Date: Fri May 28 17:30:35 2010
New Revision: 949234

URL: http://svn.apache.org/viewvc?rev=949234&view=rev
Log:
When namespace growth is enabled and a null location is provided we cannot tell whether we've loaded this schema document before so we must assume that we haven't.

Modified:
    xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java

Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=949234&r1=949233&r2=949234&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java Fri May 28 17:30:35 2010
@@ -583,7 +583,9 @@ public class XSDHandler {
             grammar = findGrammar(desc, fNamespaceGrowth);
             String schemaId = XMLEntityManager.expandSystemId(is.getSystemId(), is.getBaseSystemId(), false);
             if (grammar != null) {
-                if (!fNamespaceGrowth || grammar.getDocumentLocations().contains(schemaId)) {
+                // When namespace growth is enabled and a null location is provided we cannot tell
+                // whether we've loaded this schema document before so we must assume that we haven't.
+                if (!fNamespaceGrowth || (schemaId != null && grammar.getDocumentLocations().contains(schemaId))) {
                     return grammar; 
                 }
             }



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org