Changeset 2554

Timestamp:

08/19/09 01:46:45 (4 years ago)

Author:

lmajano

Message:

minor fix to environments

Location:

coldbox/trunk

Files:

• .settings/org.eclipse.core.resources.prefs (modified) (1 diff)
• system/interceptors/EnvironmentControl.cfc (modified) (1 diff)

coldbox/trunk/.settings/org.eclipse.core.resources.prefs

@@ -1 @@
-#Thu Aug 13 19:43:49 EDT 2009
+#Tue Aug 18 18:44:33 PDT 2009
 eclipse.preferences.version=1
 encoding//ApplicationTemplate/config/coldbox.xml.cfm=UTF-8
+encoding//testharness/config/environments.xml.cfm=UTF-8

coldbox/trunk/system/interceptors/EnvironmentControl.cfc

@@ -140 +140 @@
                         // Parse Other Sections Available in the environment config.
                         environmentXML = xmlSearch( oXML , "/environmentcontrol/environment[@name='#environment#']");
-                        environmentXML = xmlParse( toString(environmentXML[1]) );
-                        // Mail Settings
-                        oXMLParser.parseMailSettings(environmentXML[1],configSettings,oUtilities,true);         
-                        // IOC
-                        oXMLParser.parseIOC(environmentXML[1],configSettings,oUtilities,true);          
-                        // Models
-                        oXMLParser.parseModels(environmentXML[1],configSettings,oUtilities,true);               
-                        // i18N
-                        oXMLParser.parseLocalization(environmentXML[1],configSettings,oUtilities,true);
-                        // Bug Tracers
-                        oXMLParser.parseBugTracers(environmentXML[1],configSettings,oUtilities,true);
-                        // Web Services
-                        oXMLParser.parseWebservices(environmentXML[1],configSettings,oUtilities,true);
-                        // Parse Datasources
-                        oXMLParser.parseDatasources(environmentXML[1],configSettings,oUtilities,true);
-                        // Parse Debugger Settings
-                        oXMLParser.parseDebuggerSettings(environmentXML[1],configSettings,oUtilities,true);
-                        // Reload Debugger Configuration
-                        controller.getDebuggerService().getDebuggerConfig().populate(configSettings.DebuggerSettings);
-                        // Parse Interceptors
-                        oXMLParser.parseInterceptors(environmentXML[1],configSettings,oUtilities,true); 
-                        // Parse LogBox
-                        oXMLParser.parseLogBox(environmentXML[1],configSettings,oUtilities,true);
-                        // Reconfigure LogBox
-                        if( NOT structIsEmpty(configSettings["LogBoxConfig"]) ){
-                                controller.getLogBox().configure(controller.getLogBox().getConfig());
-                                controller.setLogger(controller.getLogBox().getLogger("coldbox.system.Controller"));
-                        }                               
+                        if( arrayLen(environmentXML) ){
+                                environmentXML = xmlParse( toString(environmentXML[1]) );
+                                // Mail Settings
+                                oXMLParser.parseMailSettings(environmentXML[1],configSettings,oUtilities,true);         
+                                // IOC
+                                oXMLParser.parseIOC(environmentXML[1],configSettings,oUtilities,true);          
+                                // Models
+                                oXMLParser.parseModels(environmentXML[1],configSettings,oUtilities,true);               
+                                // i18N
+                                oXMLParser.parseLocalization(environmentXML[1],configSettings,oUtilities,true);
+                                // Bug Tracers
+                                oXMLParser.parseBugTracers(environmentXML[1],configSettings,oUtilities,true);
+                                // Web Services
+                                oXMLParser.parseWebservices(environmentXML[1],configSettings,oUtilities,true);
+                                // Parse Datasources
+                                oXMLParser.parseDatasources(environmentXML[1],configSettings,oUtilities,true);
+                                // Parse Debugger Settings
+                                oXMLParser.parseDebuggerSettings(environmentXML[1],configSettings,oUtilities,true);
+                                // Reload Debugger Configuration
+                                controller.getDebuggerService().getDebuggerConfig().populate(configSettings.DebuggerSettings);
+                                // Parse Interceptors
+                                oXMLParser.parseInterceptors(environmentXML[1],configSettings,oUtilities,true); 
+                                // Parse LogBox
+                                oXMLParser.parseLogBox(environmentXML[1],configSettings,oUtilities,true);
+                                // Reconfigure LogBox
+                                if( NOT structIsEmpty(configSettings["LogBoxConfig"]) ){
+                                        controller.getLogBox().configure(controller.getLogBox().getConfig());
+                                        controller.setLogger(controller.getLogBox().getLogger("coldbox.system.Controller"));
+                                }       
+                        }                       
                 </cfscript>
         </cffunction>