|
15 | 15 | */ |
16 | 16 | package org.codehaus.groovy.grails.web.servlet.mvc; |
17 | 17 |
|
| 18 | +import grails.util.GrailsWebUtil; |
18 | 19 | import groovy.lang.Closure; |
19 | 20 | import groovy.lang.GroovyObject; |
20 | 21 | import groovy.util.Proxy; |
@@ -133,17 +134,20 @@ public ModelAndView handleURI(final String originalUri, GrailsWebRequest grailsW |
133 | 134 |
|
134 | 135 | // Step 2: lookup the controller in the application. |
135 | 136 | GrailsControllerClass controllerClass=null; |
136 | | - Object attribute = grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS, WebRequest.SCOPE_REQUEST); |
137 | | - if (attribute instanceof GrailsControllerClass) { |
138 | | - controllerClass = (GrailsControllerClass)attribute; |
139 | | - Boolean canUse = (Boolean)grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST); |
140 | | - if(canUse == null) { |
141 | | - controllerClass = null; |
142 | | - } else { |
143 | | - grailsWebRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST); |
| 137 | + if(!WebUtils.isIncludeRequest(request)) { |
| 138 | + |
| 139 | + Object attribute = grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS, WebRequest.SCOPE_REQUEST); |
| 140 | + if (attribute instanceof GrailsControllerClass) { |
| 141 | + controllerClass = (GrailsControllerClass)attribute; |
| 142 | + Boolean canUse = (Boolean)grailsWebRequest.getAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST); |
| 143 | + if(canUse == null) { |
| 144 | + controllerClass = null; |
| 145 | + } else { |
| 146 | + grailsWebRequest.removeAttribute(GrailsApplicationAttributes.GRAILS_CONTROLLER_CLASS_AVAILABLE, WebRequest.SCOPE_REQUEST); |
| 147 | + } |
144 | 148 | } |
145 | | - } |
146 | | - |
| 149 | + } |
| 150 | + |
147 | 151 | if (controllerClass == null) { |
148 | 152 | controllerClass = getControllerClassByURI(uri); |
149 | 153 | } |
|
0 commit comments