Don't suspend requests too early for the first request.

We were suspending the request before we got a chance to kick off the processing for the actual response to be run.
lift · Aug 18, 2012 · 70ffcba · 70ffcba
1 parent 7d89340
commit 70ffcba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 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
@@ -626,8 +626,6 @@ class LiftServlet extends Loggable {
                   (renderVersion ->
                     AjaxRequestInfo(handlerVersion, Empty, cont :: Nil, millis))
 
-                suspendRequest()
-
                 Empty // no response available, triggers the actual AJAX computation below
 
               case AjaxRequestInfo(storedVersion, existingResponseBox @ Full(_), _, _) =>
@@ -646,14 +644,12 @@ class LiftServlet extends Loggable {
                 (renderVersion ->
                   AjaxRequestInfo(handlerVersion, Empty, cont :: Nil, millis))
 
-              suspendRequest()
-
               Empty // no response available, triggers the actual AJAX computation below
             }
           }
 
         toReturn or {
-          Full(runAjax(requestState, liftSession, Full((result: LiftResponse) => {
+          val result = Full(runAjax(requestState, liftSession, Full((result: LiftResponse) => {
             // When we get the response, synchronizedly check that the
             // versions are still the same in the map, and, if so, update
             // any waiting actors then clear the actor list and update the
@@ -669,6 +665,10 @@ class LiftServlet extends Loggable {
               }
             }
           })))
+
+          suspendRequest()
+
+          result
         } openOr Empty
 
       case _ =>

diff --git a/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala b/web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
@@ -573,7 +573,7 @@ class LiftSession(private[http] val _contextPath: String, val uniqueId: String,
    */
   private var ajaxRequests = scala.collection.mutable.Map[String,AjaxRequestInfo]()
 
-  private[http] def withAjaxRequests[T](fn: (scala.collection.mutable.Map[String, AjaxRequestInfo]) => T) = {
+  private[http] def withAjaxRequests[T](fn: (scala.collection.mutable.Map[String, AjaxRequestInfo]) => T): T = {
     ajaxRequests.synchronized { fn(ajaxRequests) }
   }