Change-Id: I324bb6b6eb9a72eda02c5308cc6c2284094ce4b8tags/7.4.4
@@ -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(); |