1 files changed, 2 insertions, 2 deletions
diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java
index aa76dc8e08..3eb2ce24c1 100644
--- a/server/src/com/vaadin/server/VaadinServlet.java
+++ b/server/src/com/vaadin/server/VaadinServlet.java
@@ -336,11 +336,11 @@ public class VaadinServlet extends HttpServlet implements Constants {
             return;
         }
 
-        if (isStaticResourceRequest(request)) {
+        if (isStaticResourceRequest(vaadinRequest)) {
             // Define current servlet and service, but no request and response
             getService().setCurrentInstances(null, null);
             try {
-                serveStaticResources(request, response);
+                serveStaticResources(vaadinRequest, vaadinResponse);
                 return;
             } finally {
                 CurrentInstance.clearAll();