[merge from 6.7] fixes #8492, kickstart script query parameter can now be overridden (or removed)

svn changeset:23194/svn branch:6.8

1 files changed, 12 insertions, 1 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
index 3957c84a71..13082cf1aa 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
@@ -1897,7 +1897,7 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
 
         final String widgetsetFilePath = widgetsetBasePath + "/"
                 + WIDGETSET_DIRECTORY_PATH + widgetset + "/" + widgetset
-                + ".nocache.js?" + new Date().getTime();
+                + ".nocache.js" + createPreventCachingQueryString();
 
         // Get system messages
         Application.SystemMessages systemMessages = null;
@@ -2007,6 +2007,17 @@ public abstract class AbstractApplicationServlet extends HttpServlet implements
     }
 
     /**
+     * To ensure the GWT kickstart scritp is downloaded each time (even if
+     * server caching is not set up right), we add a unique query parameter to
+     * the end of the script file.
+     * 
+     * @return
+     */
+    protected String createPreventCachingQueryString() {
+        return "?" + new Date().getTime();
+    }
+
+    /**
      * @return true if the served application is considered to be the only or
      *         main content of the host page. E.g. various embedding solutions
      *         should override this to false.