diff options
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/com/vaadin/server/BootstrapHandler.java | 5 | ||||
| -rw-r--r-- | server/src/com/vaadin/server/VaadinServlet.java | 5 |
2 files changed, 3 insertions, 7 deletions
diff --git a/server/src/com/vaadin/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java index 80f678d9bd..ad491745dd 100644 --- a/server/src/com/vaadin/server/BootstrapHandler.java +++ b/server/src/com/vaadin/server/BootstrapHandler.java @@ -359,10 +359,7 @@ public abstract class BootstrapHandler extends SynchronizedRequestHandler { // Load client-side dependencies for push support fragmentNodes.add(new Element(Tag.valueOf("script"), "").attr( "type", "text/javascript").attr("src", - vaadinLocation + "jquery-1.7.2.rebased.js")); - fragmentNodes.add(new Element(Tag.valueOf("script"), "").attr( - "type", "text/javascript").attr("src", - vaadinLocation + "jquery.atmosphere.rebased.js")); + vaadinLocation + "vaadinPush.js")); } String bootstrapLocation = vaadinLocation + "vaadinBootstrap.js"; diff --git a/server/src/com/vaadin/server/VaadinServlet.java b/server/src/com/vaadin/server/VaadinServlet.java index 70e77b0b8a..9dc62808c7 100644 --- a/server/src/com/vaadin/server/VaadinServlet.java +++ b/server/src/com/vaadin/server/VaadinServlet.java @@ -507,9 +507,8 @@ public class VaadinServlet extends HttpServlet implements Constants { private boolean serveStaticResources(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - // FIXME What does 10 refer to? String pathInfo = request.getPathInfo(); - if (pathInfo == null || pathInfo.length() <= 10) { + if (pathInfo == null) { return false; } @@ -907,7 +906,7 @@ public class VaadinServlet extends HttpServlet implements Constants { protected boolean isStaticResourceRequest(HttpServletRequest request) { String pathInfo = request.getPathInfo(); - if (pathInfo == null || pathInfo.length() <= 10) { + if (pathInfo == null) { return false; } |