Merge pull request #13911 from codeconsole/7.0.x-layout-refactor

codeconsole · web-flow · commit 7172ccd55b5e · 2024-12-05T13:58:56.000-08:00
Remove no longer needed return statement
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
@@ -533,11 +533,9 @@ trait ResponseRenderer extends WebAttributes {
     }
 
     private void setLayout(HttpServletRequest request, String layout) {
-        if (layout == null || request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) != null) {
-            // layout has been set already
-            return
+        if (layout != null && request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) == null) {
+            request.setAttribute WebUtils.LAYOUT_ATTRIBUTE, layout
         }
-        request.setAttribute WebUtils.LAYOUT_ATTRIBUTE, layout
     }
 
     private String getContextPath(GrailsWebRequest webRequest, Map argMap) {

Original file line number	Diff line number	Diff line change
`@@ -533,11 +533,9 @@ trait ResponseRenderer extends WebAttributes {`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`private void setLayout(HttpServletRequest request, String layout) {`
`536`		`- if (layout == null \|\| request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) != null) {`
`537`		`- // layout has been set already`
`538`		`- return`
	`536`	`+ if (layout != null && request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) == null) {`
	`537`	`+ request.setAttribute WebUtils.LAYOUT_ATTRIBUTE, layout`
`539`	`538`	`}`
`540`		`- request.setAttribute WebUtils.LAYOUT_ATTRIBUTE, layout`
`541`	`539`	`}`
`542`	`540`
`543`	`541`	`private String getContextPath(GrailsWebRequest webRequest, Map argMap) {`