simplify logic

codeconsole · codeconsole · commit 0a96b56be1af · 2024-12-05T09:57:44.000-08: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
@@ -533,13 +533,11 @@ trait ResponseRenderer extends WebAttributes {
     }
 
     private void setLayout(HttpServletRequest request, boolean renderView, String layout) {
-        if (layout == null && request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) != null) {
+        if (layout == null || request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) != null) {
             // layout has been set already
             return
         }
-        if (layout != 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,13 +533,11 @@ trait ResponseRenderer extends WebAttributes {`
`533`	`533`	`}`
`534`	`534`
`535`	`535`	`private void setLayout(HttpServletRequest request, boolean renderView, String layout) {`
`536`		`- if (layout == null && request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) != null) {`
	`536`	`+ if (layout == null \|\| request.getAttribute(WebUtils.LAYOUT_ATTRIBUTE) != null) {`
`537`	`537`	`// layout has been set already`
`538`	`538`	`return`
`539`	`539`	`}`
`540`		`- if (layout != null) {`
`541`		`- request.setAttribute WebUtils.LAYOUT_ATTRIBUTE, layout`
`542`		`- }`
	`540`	`+ request.setAttribute WebUtils.LAYOUT_ATTRIBUTE, layout`
`543`	`541`	`}`
`544`	`542`
`545`	`543`	`private String getContextPath(GrailsWebRequest webRequest, Map argMap) {`