Merge pull request #2 from grails/3.2.x

3.2.x
grails · Jul 21, 2017 · 3e12a25 · 3e12a25
2 parents 43dc5c5 + a72bc59
commit 3e12a25
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy b/grails-bootstrap/src/main/groovy/grails/util/Metadata.groovy
@@ -99,7 +99,7 @@ class Metadata extends NavigableMap implements ConfigMap  {
 
     private void afterLoading() {
         // allow override via system properties
-        merge(System.properties.findAll { key, val -> val }, true)
+        merge(new LinkedHashMap(System.properties).findAll { key, val -> val }, true)
         def value = get(WAR_DEPLOYED)
         warDeployed = value != null ? Boolean.valueOf(value.toString()) : false
     }

diff --git a/grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy b/grails-databinding/src/main/groovy/grails/databinding/SimpleDataBinder.groovy
@@ -447,6 +447,8 @@ class SimpleDataBinder implements DataBinder {
             val = []
         } else if (SortedSet.isAssignableFrom(type)) {
             val = new TreeSet()
+        } else if (LinkedHashSet.isAssignableFrom(type)) {
+            val = new LinkedHashSet()
         } else if (Collection.isAssignableFrom(type)) {
             val = new HashSet()
         }

diff --git a/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy b/grails-gradle-plugin/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy
@@ -91,6 +91,9 @@ class GrailsGradlePlugin extends GroovyPlugin {
 
     @CompileStatic
     void apply(Project project) {
+        // reset the environment to ensure it is resolved again for each invocation
+        Environment.reset()
+
         if( project.tasks.findByName('compileGroovy') == null ) {
             super.apply(project)
         }