Move map population outside of process block

grails · Sep 4, 2015 · fe79c15 · fe79c15
1 parent 4386701
commit fe79c15
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/grails-core/src/main/groovy/org/grails/config/yaml/YamlPropertySourceLoader.groovy b/grails-core/src/main/groovy/org/grails/config/yaml/YamlPropertySourceLoader.groovy
@@ -62,13 +62,14 @@ class YamlPropertySourceLoader extends YamlProcessor implements PropertySourceLo
             resources = [resource] as Resource[]
             def propertySource = new NavigableMap()
             process { Properties properties, Map<String, Object> map ->
-                if(groovyConfigMap != null) {
-                    propertySource.merge( groovyConfigMap.source, false )
-                }
                 propertySource.merge(map, false)
                 propertySource.merge(properties, false)
                 propertySource.putAll( propertySource.toFlatConfig() )
             }
+            if(groovyConfigMap != null) {
+                propertySource.merge( groovyConfigMap.source, false )
+            }
+
             if (!propertySource.isEmpty()) {
                 return new MapPropertySource(name, propertySource);
             }