make sure fork settings are a map prior to assignment

graemerocher · graemerocher · commit 9ccaa08e97d0 · 2014-06-24T18:12:36.000+02:00
diff --git a/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy b/grails-bootstrap/src/main/groovy/grails/util/BuildSettings.groovy
@@ -1508,7 +1508,7 @@ class BuildSettings extends AbstractBuildSettings {
         String syspropDebugArgs = System.getProperty("grails.project.fork.run.debugArgs")
         boolean debugFork = Boolean.getBoolean(ForkedGrailsProcess.DEBUG_FORK)
         if (syspropDebugArgs || debugFork) {
-            if (result.run instanceof Boolean) {
+            if (!(result.run instanceof Map)) {
                 result.run = [:]
             }
             result.run.debug = true
@@ -1518,7 +1518,7 @@ class BuildSettings extends AbstractBuildSettings {
         }
         syspropDebugArgs = System.getProperty("grails.project.fork.test.debugArgs")
         if (syspropDebugArgs || debugFork) {
-            if (result.test instanceof Boolean) {
+            if (!(result.test instanceof Map)) {
                 result.test = [:]
             }
             result.test.debug = true

Original file line number	Diff line number	Diff line change
`@@ -1508,7 +1508,7 @@ class BuildSettings extends AbstractBuildSettings {`
`1508`	`1508`	`String syspropDebugArgs = System.getProperty("grails.project.fork.run.debugArgs")`
`1509`	`1509`	`boolean debugFork = Boolean.getBoolean(ForkedGrailsProcess.DEBUG_FORK)`
`1510`	`1510`	`if (syspropDebugArgs \|\| debugFork) {`
`1511`		`- if (result.run instanceof Boolean) {`
	`1511`	`+ if (!(result.run instanceof Map)) {`
`1512`	`1512`	`result.run = [:]`
`1513`	`1513`	`}`
`1514`	`1514`	`result.run.debug = true`
`@@ -1518,7 +1518,7 @@ class BuildSettings extends AbstractBuildSettings {`
`1518`	`1518`	`}`
`1519`	`1519`	`syspropDebugArgs = System.getProperty("grails.project.fork.test.debugArgs")`
`1520`	`1520`	`if (syspropDebugArgs \|\| debugFork) {`
`1521`		`- if (result.test instanceof Boolean) {`
	`1521`	`+ if (!(result.test instanceof Map)) {`
`1522`	`1522`	`result.test = [:]`
`1523`	`1523`	`}`
`1524`	`1524`	`result.test.debug = true`