GRAILS-8917 if nothing is returned from a controller action, use an e…

…mpty model, not the properties of the controller instance
grails · Jul 28, 2013 · 544f37b · 544f37b
1 parent cb22c50
commit 544f37b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 61 deletions.
diff --git a/...ain/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerHelper.java b/...ain/groovy/org/codehaus/groovy/grails/web/servlet/mvc/AbstractGrailsControllerHelper.java
@@ -384,15 +384,7 @@ public ModelAndView handleActionResponse(GroovyObject controller, Object returnV
             if (viewNameBlank) {
                 return null;
             }
-
-            Map model;
-            if (!chainModel.isEmpty()) {
-                model = new CompositeMap(chainModel, new GrailsControllerBeanMap(controller));
-            }
-            else {
-                model = new GrailsControllerBeanMap(controller);
-            }
-            return new ModelAndView(viewName, model);
+            return new ModelAndView(viewName, chainModel);
         }
 
         if (returnValue instanceof Map) {
@@ -430,14 +422,7 @@ public ModelAndView handleActionResponse(GroovyObject controller, Object returnV
             return modelAndView;
         }
 
-        Map model;
-        if (!chainModel.isEmpty()) {
-            model = new CompositeMap(chainModel, new GrailsControllerBeanMap(controller));
-        }
-        else {
-            model = new GrailsControllerBeanMap(controller);
-        }
-        return new ModelAndView(viewName, model);
+        return new ModelAndView(viewName, chainModel);
     }
 
     @SuppressWarnings("rawtypes")

diff --git a/...b/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsControllerBeanMap.java b/...b/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsControllerBeanMap.java