fix for GRAILS-1517

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

Author: graeme

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

@@ -227,13 +227,21 @@ public ModelAndView handleURI(String uri, GrailsWebRequest webRequest, Map param
         // Step 5: get the view name for this URI.
         String viewName = controllerClass.getViewByURI(uri);
 
+        boolean executeAction = invokeBeforeInterceptor(controller, controllerClass);
+        // if the interceptor returned false don't execute the action
+        if(!executeAction)
+            return null;
+
+        ModelAndView mv;
         if(controllerClass.isFlowAction(actionName)) {
-            return executeFlow(webRequest,request, response);
+            mv = executeFlow(webRequest,request, response);
         }
         else {
-            return executeAction(controller, controllerClass, viewName, request, response, params);
+            mv = executeAction(controller, controllerClass, viewName, request, response, params);
         }
 
+        boolean returnModelAndView = invokeAfterInterceptor(controllerClass, controller, mv);
+        return returnModelAndView ? mv : null;
     }
 
     /**
@@ -248,6 +256,7 @@ protected ModelAndView executeFlow(GrailsWebRequest webRequest, final HttpServle
         final Thread currentThread = Thread.currentThread();
         ClassLoader cl = currentThread.getContextClassLoader();
         try {
+
             currentThread.setContextClassLoader(application.getClassLoader());
 
             FlowExecutorArgumentHandler argumentHandler = new GrailsConventionsFlowExecutorArgumentHandler(webRequest);
@@ -268,6 +277,8 @@ public String getDispatcherPath() {
                     return super.getDispatcherPath();
                 }
             };
+
+
             ResponseInstruction responseInstruction = createRequestHandler(argumentHandler).handleFlowRequest(externalContext);
 
             return toModelAndView(responseInstruction, externalContext, argumentHandler);
@@ -366,12 +377,6 @@ protected ModelAndView executeAction(GroovyObject controller, GrailsControllerCl
         // Step 5a: Check if there is a before interceptor if there is execute it
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         try {
-            Thread.currentThread().setContextClassLoader(application.getClassLoader());
-            boolean executeAction = invokeBeforeInterceptor(controller, controllerClass);
-            // if the interceptor returned false don't execute the action
-            if(!executeAction)
-        	return null;
-
             // Step 6: get closure from closure property
             Closure action;
             try {
@@ -386,7 +391,6 @@ protected ModelAndView executeAction(GroovyObject controller, GrailsControllerCl
                     if(LOG.isDebugEnabled()) {
                         LOG.debug("Response has been redirected, returning null model and view");
                     }
-                    invokeAfterInterceptor(controllerClass, controller, null);
                     return null;
                 }
                 else {
@@ -398,8 +402,7 @@ protected ModelAndView executeAction(GroovyObject controller, GrailsControllerCl
                     if(LOG.isDebugEnabled()) {
                         LOG.debug("Action ["+actionName+"] handled, created Spring model and view ["+mv+"]");
                     }
-                    boolean returnModelAndView = invokeAfterInterceptor(controllerClass, controller, mv);
-                    return returnModelAndView ? mv : null;
+                    return mv;
                 }
 
             }