summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2015-04-14 14:02:32 +0300
committerMarkus Koivisto <markus@vaadin.com>2015-04-15 11:59:35 +0300
commit798f8fa2aea057be146f9f56305d80a10b4d78f4 (patch)
tree2eef819ef171dc8ff1597c533573f5863d3ce56d
parentf9755c613771cc3d08ae76d969249ee53c8398f3 (diff)
downloadvaadin-framework-798f8fa2aea057be146f9f56305d80a10b4d78f4.tar.gz
vaadin-framework-798f8fa2aea057be146f9f56305d80a10b4d78f4.zip
Use VaadinRequest/Response for static resources (#17462)
Change-Id: I324bb6b6eb9a72eda02c5308cc6c2284094ce4b8
-rw-r--r--server/src/com/vaadin/server/VaadinServlet.java4
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();