fix for GRAILS-1518

graeme · graeme · commit 0dd29eea342b · 2007-08-21T23:46:01.000Z
git-svn-id: https://svn.codehaus.org/grails/trunk@5269 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d
diff --git a/src/commons/org/codehaus/groovy/grails/commons/DefaultGrailsApplication.java b/src/commons/org/codehaus/groovy/grails/commons/DefaultGrailsApplication.java
@@ -206,6 +206,9 @@ private void loadMetadata() {
         catch (IOException e) {
             log.warn("No application metadata file found at " + r);
         }
+        if (System.getProperty(GrailsApplication.ENVIRONMENT) != null) {
+        	meta.setProperty(GrailsApplication.ENVIRONMENT, System.getProperty(GrailsApplication.ENVIRONMENT));
+        }
         applicationMeta = Collections.unmodifiableMap(meta);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,9 @@ private void loadMetadata() {`
`206`	`206`	`catch (IOException e) {`
`207`	`207`	`log.warn("No application metadata file found at " + r);`
`208`	`208`	`}`
	`209`	`+ if (System.getProperty(GrailsApplication.ENVIRONMENT) != null) {`
	`210`	`+ meta.setProperty(GrailsApplication.ENVIRONMENT, System.getProperty(GrailsApplication.ENVIRONMENT));`
	`211`	`+ }`
`209`	`212`	`applicationMeta = Collections.unmodifiableMap(meta);`
`210`	`213`	`}`
`211`	`214`