Fix bug where attempts to create a PE or HE configuration sometimes s…

…ilently failed and produced an HE configuration
ndw · Jan 1, 2012 · 1a65c16 · 1a65c16
1 parent 1e9ecad
commit 1a65c16
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/com/xmlcalabash/core/XProcConfiguration.java b/src/com/xmlcalabash/core/XProcConfiguration.java
@@ -161,6 +161,11 @@ private void init(String proctype, boolean schemaAware, String saxoncfg) {
         createSaxonProcessor(proctype, schemaAware, saxoncfg);
         loadConfiguration();
 
+        // If we got a schema aware processor, make sure it's reflected in our config
+        // FIXME: are there other things that should be reflected this way?
+        this.schemaAware = cfgProcessor.isSchemaAware();
+        this.saxonProcessor = cfgProcessor.getUnderlyingConfiguration().softwareEdition.toLowerCase();
+
         if (!(proctype == null || saxonProcessor.equals(proctype)) || schemaAware != this.schemaAware ||
             (saxoncfg == null && saxonConfigFile != null)) {
             // Drat. We have to restart to get the right configuration.
@@ -174,12 +179,12 @@ private void init(String proctype, boolean schemaAware, String saxoncfg) {
 
             createSaxonProcessor(saxonProcessor, this.schemaAware, saxonConfigFile);
             loadConfiguration();
-        }
 
-        // If we got a schema aware processor, make sure it's reflected in our config
-        // FIXME: are there other things that should be reflected this way?
-        this.schemaAware = cfgProcessor.isSchemaAware();
-        this.saxonProcessor = cfgProcessor.getUnderlyingConfiguration().softwareEdition.toLowerCase();
+            // If we got a schema aware processor, make sure it's reflected in our config
+            // FIXME: are there other things that should be reflected this way?
+            this.schemaAware = cfgProcessor.isSchemaAware();
+            this.saxonProcessor = cfgProcessor.getUnderlyingConfiguration().softwareEdition.toLowerCase();
+        }
     }
 
     private void createSaxonProcessor(String proctype, boolean schemaAware, String saxoncfg) {