diff --git a/web/src/main/java/org/springframework/security/web/FilterInvocation.java b/web/src/main/java/org/springframework/security/web/FilterInvocation.java
index 8bda36a9d5..7c7fe37847 100644
--- a/web/src/main/java/org/springframework/security/web/FilterInvocation.java
+++ b/web/src/main/java/org/springframework/security/web/FilterInvocation.java
@@ -49,6 +49,7 @@ import org.springframework.security.web.util.UrlUtils;
  *
  * @author Ben Alex
  * @author colin sampaleanu
+ * @author Luke Taylor
  */
 public class FilterInvocation {
     //~ Static fields ==================================================================================================
@@ -58,8 +59,6 @@ public class FilterInvocation {
         }
     };
 
-    static final HttpServletResponse DUMMY_RESPONSE = new DummyResponse();
-
     //~ Instance fields ================================================================================================
 
     private FilterChain chain;
@@ -94,6 +93,7 @@ public class FilterInvocation {
         request.setContextPath(contextPath);
         request.setServletPath(servletPath);
         request.setPathInfo(pathInfo);
+        request.setQueryString(query);
         request.setMethod(method);
         this.request = request;
     }
@@ -146,7 +146,7 @@ public class FilterInvocation {
     }
 }
 
-@SuppressWarnings("unchecked")
+@SuppressWarnings({"unchecked", "deprecation"})
 class DummyRequest implements HttpServletRequest {
     private String requestURI;
     private String contextPath = "";
@@ -398,6 +398,7 @@ class DummyRequest implements HttpServletRequest {
     }
 }
 
+@SuppressWarnings({"deprecation"})
 class DummyResponse implements HttpServletResponse {
     public void addCookie(Cookie cookie) {
         throw new UnsupportedOperationException();