Skip to content

Commit e1885c2

Browse files
committed
fix for GRAILS-10201 ""Method name must not be null" error after upgrading from 2.2.1 to 2.2.3"
1 parent 7377657 commit e1885c2

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerHelper.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
package org.codehaus.groovy.grails.web.servlet.mvc;
1717

18+
import grails.util.GrailsWebUtil;
1819
import groovy.lang.Closure;
1920
import groovy.lang.GroovyObject;
2021
import groovy.util.Proxy;
@@ -133,17 +134,20 @@ public ModelAndView handleURI(final String originalUri, GrailsWebRequest grailsW
133134

134135
// Step 2: lookup the controller in the application.
135136
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+
}
144148
}
145-
}
146-
149+
}
150+
147151
if (controllerClass == null) {
148152
controllerClass = getControllerClassByURI(uri);
149153
}

0 commit comments

Comments
 (0)