Merge pull request #455 from candrews/patch-5

Exceptions inside includes should propogate up
grails · Jul 27, 2014 · 3333ea7 · 3333ea7
2 parents d8c736d + 8a09ff7
commit 3333ea7
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/...s-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java b/...s-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/GrailsDispatcherServlet.java
@@ -347,13 +347,17 @@ public Locale getLocale() {
                 }
             }
             catch (ModelAndViewDefiningException ex) {
+                // Exceptions inside includes should propogate up so the original dispatcher handles the exception
+                if(WebUtils.isIncludeRequest(request)) throw ex;
                 handlerException = ex;
                 if (logger.isDebugEnabled()) {
                     logger.debug("ModelAndViewDefiningException encountered", ex);
                 }
                 mv = ex.getModelAndView();
             }
             catch (Exception ex) {
+                // Exceptions inside includes should propogate up so the original dispatcher handles the exception
+                if(WebUtils.isIncludeRequest(request)) throw ex;
                 handlerException = ex;
                 Object handler = (mappedHandler != null ? mappedHandler.getHandler() : null);
                 mv = processHandlerException(request, response, handler, ex);