Delimit version in GUID string by a dash.

Before we were relying on the expected length of the funcName, determined by calling nextFuncName. Because funcName isn't *always* the same length, we switch instead ot putting a - between the GUID and the version identifier in the path. We then look for it when extracting the version identifier.
shashwata · Aug 18, 2012 · 1c46530 · 1c46530
1 parent ba0b313
commit 1c46530
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftServlet.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftServlet.scala
@@ -418,11 +418,11 @@ class LiftServlet extends Loggable {
 
   private object AjaxVersions {
     def unapply(ajaxPathPart: String) : Option[(String,Int)] = {
-      val funcLength = Helpers.nextFuncName.length
-      if (ajaxPathPart.length > funcLength)
+      val dash = ajaxPathPart.indexOf("-")
+      if (dash > -1 && ajaxPathPart.length > dash + 1)
         Some(
-          (ajaxPathPart.substring(0, funcLength),
-           ajaxPathPart.charAt(funcLength))
+          (ajaxPathPart.substring(0, dash),
+           ajaxPathPart.charAt(dash + 1))
         )
       else
         None

diff --git a/web/webkit/src/main/scala/net/liftweb/http/js/ScriptRenderer.scala b/web/webkit/src/main/scala/net/liftweb/http/js/ScriptRenderer.scala
@@ -186,7 +186,7 @@ object ScriptRenderer {
        addPageNameAndVersion: function(url) {
          return """ + {
     if (LiftRules.enableLiftGC) {
-      "url.replace('" + LiftRules.ajaxPath + "', '" + LiftRules.ajaxPath + "/'+lift_page+(liftAjax.lift_ajaxVersion % 36).toString(36));"
+      "url.replace('" + LiftRules.ajaxPath + "', '" + LiftRules.ajaxPath + "/'+lift_page+('-'+liftAjax.lift_ajaxVersion%36).toString(36));"
     } else {
       "url;"
     }