You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2007/03/22 23:12:06 UTC
svn commit: r521495 -
/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java
Author: mrglavas
Date: Thu Mar 22 15:12:05 2007
New Revision: 521495
URL: http://svn.apache.org/viewvc?view=rev&rev=521495
Log:
Avoid the XMLConfigurationException thrown from the component
manager when the XMLSchemaLoader is used an XMLGrammarLoader.
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java
Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java?view=diff&rev=521495&r1=521494&r2=521495
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/XMLSchemaLoader.java Thu Mar 22 15:12:05 2007
@@ -933,14 +933,7 @@
fSubGroupHandler.reset();
- boolean parser_settings;
- try {
- parser_settings = componentManager.getFeature(PARSER_SETTINGS);
- }
- catch (XMLConfigurationException e){
- parser_settings = true;
- }
- if (!parser_settings || !fSettingsChanged) {
+ if (!fSettingsChanged || !parserSettingsUpdated(componentManager)) {
// need to reprocess JAXP schema sources
fJAXPProcessed = false;
// reinitialize grammar bucket
@@ -1019,6 +1012,14 @@
fSchemaHandler.setGenerateSyntheticAnnotations(false);
}
fSchemaHandler.reset(componentManager);
+ }
+
+ private boolean parserSettingsUpdated(XMLComponentManager componentManager) {
+ try {
+ return componentManager.getFeature(PARSER_SETTINGS);
+ }
+ catch (XMLConfigurationException e) {}
+ return true;
}
private void initGrammarBucket(){
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org