@@ -139,7 +139,7 @@ trait ResponseRenderer extends WebAttributes {
139139 else {
140140 renderMarkupInternal webRequest, closure, response
141141 }
142- setLayout webRequest. currentRequest, false , layoutArg
142+ setLayout webRequest. currentRequest, layoutArg
143143 }
144144
145145 private void renderJsonInternal(HttpServletResponse response, @DelegatesTo (value = StreamingJsonBuilder.StreamingJsonDelegate .class, strategy = Closure .DELEGATE_FIRST ) Closure callable) {
@@ -163,7 +163,7 @@ trait ResponseRenderer extends WebAttributes {
163163 applyContentType response, argMap, body
164164 handleStatusArgument argMap, webRequest, response
165165 render body
166- setLayout webRequest. currentRequest, false , layoutArg
166+ setLayout webRequest. currentRequest, layoutArg
167167 }
168168
169169 /**
@@ -207,7 +207,7 @@ trait ResponseRenderer extends WebAttributes {
207207 handleStatusArgument argMap, webRequest, response
208208 applyContentType response, argMap, writable
209209 renderWritable writable, response
210- setLayout webRequest. currentRequest, false , layoutArg
210+ setLayout webRequest. currentRequest, layoutArg
211211 webRequest. renderView = false
212212 }
213213
@@ -235,7 +235,7 @@ trait ResponseRenderer extends WebAttributes {
235235 CharSequence text = (textArg instanceof CharSequence ) ? ((CharSequence )textArg) : textArg. toString()
236236 render text
237237 }
238- setLayout webRequest. currentRequest, false , layoutArg
238+ setLayout webRequest. currentRequest, layoutArg
239239 }
240240 else if (argMap. containsKey(ARGUMENT_VIEW )) {
241241 String viewName = argMap[ARGUMENT_VIEW ]. toString()
@@ -263,7 +263,7 @@ trait ResponseRenderer extends WebAttributes {
263263 }
264264
265265 ((GroovyObject )this ). setProperty " modelAndView" , new ModelAndView (viewUri, model)
266- setLayout webRequest. currentRequest, true , layoutArg
266+ setLayout webRequest. currentRequest, layoutArg
267267 }
268268 else if (argMap. containsKey(ARGUMENT_TEMPLATE )) {
269269 applyContentType response, argMap, null , false
@@ -300,7 +300,7 @@ trait ResponseRenderer extends WebAttributes {
300300 // if automatic decoration occurred unwrap, since this is a partial
301301
302302 if (renderWithLayout) {
303- setLayout webRequest. currentRequest, false , layoutArg
303+ setLayout webRequest. currentRequest, layoutArg
304304 }
305305
306306
@@ -532,7 +532,7 @@ trait ResponseRenderer extends WebAttributes {
532532 renderArgument instanceof GPathResult ? APPLICATION_XML : defaultEncoding
533533 }
534534
535- private void setLayout(HttpServletRequest request, boolean renderView, String layout) {
535+ private void setLayout(HttpServletRequest request, String layout) {
536536 if (layout == null || request. getAttribute(WebUtils . LAYOUT_ATTRIBUTE ) != null ) {
537537 // layout has been set already
538538 return
0 commit comments