Author: mrglavas
Date: Wed Nov 25 06:27:14 2009
New Revision: 883990

URL: http://svn.apache.org/viewvc?rev=883990&view=rev
Log:
If the value of "use-grammar-pool-only" is true do not allow any mutations to 
the existing grammars or any new grammars to be loaded, even if the 
"namespace-growth" feature has been enabled. This is the behaviour required by 
JAXP when an application loads the schemas up front from a SchemaFactory.

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

Modified: 
xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java
URL: 
http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java?rev=883990&r1=883989&r2=883990&view=diff
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java 
(original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaValidator.java Wed 
Nov 25 06:27:14 2009
@@ -2645,8 +2645,8 @@
             }
         }
 
-        if ((grammar == null && !fUseGrammarPoolOnly) || 
-            (fNamespaceGrowth && !hasSchemaComponent(grammar, contextType, 
triggeringComponent))) {
+        if (!fUseGrammarPoolOnly && (grammar == null || 
+            (fNamespaceGrowth && !hasSchemaComponent(grammar, contextType, 
triggeringComponent)))) {
             fXSDDescription.reset();
             fXSDDescription.fContextType = contextType;
             fXSDDescription.setNamespace(namespace);



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to