Flash scope is now initialised in the GrailsWebRequestFilter, before

the Grails filters are invoked. This means that the 'flash' object
can now be used from within 'before' filters.


git-svn-id: https://svn.codehaus.org/grails/trunk@6482 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: pledbrook

src/web/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequestFilter.java

@@ -16,6 +16,7 @@
 package org.codehaus.groovy.grails.web.servlet.mvc;
 
 import org.codehaus.groovy.grails.web.servlet.GrailsApplicationAttributes;
+import org.codehaus.groovy.grails.web.servlet.FlashScope;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -55,6 +56,15 @@ protected void doFilterInternal(
 		}
 		try {
             request.setAttribute(GrailsApplicationAttributes.WEB_REQUEST, webRequest);
+
+            // Set the flash scope instance to its next state. We do
+            // this here so that the flash is available from Grails
+            // filters in a valid state.
+            FlashScope fs = webRequest.getAttributes().getFlashScope(request);
+            fs.next();
+
+            // Pass control on to the next filter (or the servlet if
+            // there are no more filters in the chain).
             filterChain.doFilter(request, response);
 		}
 		finally {

src/web/org/codehaus/groovy/grails/web/servlet/mvc/SimpleGrailsControllerHelper.java

@@ -217,11 +217,7 @@ public ModelAndView handleURI(String uri, GrailsWebRequest webRequest, Map param
                 throw new NoClosurePropertyForURIException("Could not find closure property for URI [" + uri + "] for controller [" + controllerClass.getFullName() + "]!");
         }
 
-        // set the flash scope instance to its next state and set on controller
-        FlashScope fs = this.grailsAttributes.getFlashScope(request);
-        fs.next();
-
-        // Step 4b: Set grails attributes in request scope
+        // Step 4: Set grails attributes in request scope
         request.setAttribute(GrailsApplicationAttributes.REQUEST_SCOPE_ID,this.grailsAttributes);
 
         // Step 5: get the view name for this URI.