Optimize GrailsWebRequest instantiation

grails · May 14, 2013 · 2f7c38d · 2f7c38d
1 parent 83197dd
commit 2f7c38d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
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
@@ -292,7 +292,11 @@ public Locale getLocale() {
                 }
                 // Expose current RequestAttributes to current thread.
                 previousRequestAttributes = RequestContextHolder.currentRequestAttributes();
-                requestAttributes = new GrailsWebRequest(processedRequest, response, getServletContext());
+                if(previousRequestAttributes instanceof GrailsWebRequest) {
+                    requestAttributes = new GrailsWebRequest(processedRequest, response, ((GrailsWebRequest)previousRequestAttributes).getAttributes());
+                } else {
+                    requestAttributes = new GrailsWebRequest(processedRequest, response, getServletContext());
+                }
                 if( previousRequestAttributes != null) {
                     copyParamsFromPreviousRequest(previousRequestAttributes, requestAttributes);
                 }

diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequest.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/servlet/mvc/GrailsWebRequest.java
@@ -75,6 +75,11 @@ public class GrailsWebRequest extends DispatcherServletWebRequest implements Par
     private String baseUrl;
 
     private EncodingStateRegistry encodingStateRegistry;
+
+    public GrailsWebRequest(HttpServletRequest request, HttpServletResponse response, GrailsApplicationAttributes attributes) {
+        super(request, response);
+        this.attributes = attributes;
+    }
 
     public GrailsWebRequest(HttpServletRequest request, HttpServletResponse response, ServletContext servletContext) {
         super(request, response);