Make null config reading safe

graemerocher · graemerocher · commit d03a4b038fb1 · 2015-12-21T11:17:54.000+01:00
diff --git a/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy b/grails-plugin-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy
@@ -150,7 +150,7 @@ trait ResponseRenderer extends WebAttributes {
     }
 
     private void renderJsonInternal(HttpServletResponse response, Closure callable) {
-        if( Holders.getConfig().getProperty(Settings.SETTING_LEGACY_JSON_BUILDER, Boolean.class, false) ) {
+        if( Holders.getConfig()?.getProperty(Settings.SETTING_LEGACY_JSON_BUILDER, Boolean.class, false) ) {
             def builder = new JSONBuilder()
             JSON json = builder.build(callable)
             json.render response

Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ trait ResponseRenderer extends WebAttributes {`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`private void renderJsonInternal(HttpServletResponse response, Closure callable) {`
`153`		`- if( Holders.getConfig().getProperty(Settings.SETTING_LEGACY_JSON_BUILDER, Boolean.class, false) ) {`
	`153`	`+ if( Holders.getConfig()?.getProperty(Settings.SETTING_LEGACY_JSON_BUILDER, Boolean.class, false) ) {`
`154`	`154`	`def builder = new JSONBuilder()`
`155`	`155`	`JSON json = builder.build(callable)`
`156`	`156`	`json.render response`