Author: mrglavas
Date: Fri May 28 17:31:04 2010
New Revision: 949235
URL: http://svn.apache.org/viewvc?rev=949235&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/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java?rev=949235&r1=949234&r2=949235&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDHandler.java
Fri May 28 17:31:04 2010
@@ -635,7 +635,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: [email protected]
For additional commands, e-mail: [email protected]
