Changeset 1989

Timestamp:

11/25/2009 12:32:18 AM (4 months ago)

Author:

peterfarrell

Message:

Closes[t:460]

Files:

• framework/1-8-0/trunk/properties/EnvironmentProperty.cfc (modified) (5 diffs)

framework/1-8-0/trunk/properties/EnvironmentProperty.cfc

@@ -229 +229 @@
                 <!--- Fail back to default environment if no environment match is found --->
                 <cfelse>
-                        <!--- Do some checks if allowed --->
+                        <!--- Do some checks --->
                         <cfif NOT getThrowIfEnvironmentUnresolved()>
                                 <cfset getAssert().isTrue(NOT environmentNameInherited
@@ -238 +238 @@
                                                 , "Please define a default environment to use or add this server to a defined environment.") />
                         </cfif>
-                        
+                                
                         <cfset loadPropertiesByEnvironmentName(getDefaultEnvironment()) />
                 </cfif>
@@ -335 +335 @@
                                 <cfif variables.matcher.match(environmentGroupServerMap[j].server, thisServer)>
                                         <cfset environmentName = environmentGroupServerMap[j].environmentName />
-                                        <cfset getAppManager().setEnvironmentName(environmentName) />
-                                        <cfset getAppManager().setEnvironmentGroup(i) />
                                         <cfset resolvedEnvironment = true />
                                         <cfbreak />
@@ -354 +352 @@
                 <cfargument name="environmentName" type="string" required="true" />
                 
-                <cfset var properties = variables.environments[environmentName].properties />
+                <cfset var environment = variables.environments[environmentName] />
+                <cfset var properties = environment.properties />
                 <cfset var key = "" />
 
@@ -364 +363 @@
                 <!--- Set the server name to the property --->
                 <cfset setProperty(getServerPropertyName(), cgi.SERVER_NAME) />
+                
+                <cfset getAppManager().setEnvironmentName(environmentName) />
+                <cfset getAppManager().setEnvironmentGroup(environment.environmentGroup) />
         </cffunction>