Permalink
Browse files

Drop the timeout on comet-related AJAX requests.

While this will tie up a request thread for longer, it means we can
reliably say that when the AJAX request thread completes, it will
actually have the correct response to the original request.
  • Loading branch information...
1 parent 9878065 commit d2ec29f36a5a43d86c928d2b6f80eed913182fae @Shadowfiend Shadowfiend committed Sep 24, 2012
Showing with 1 addition and 3 deletions.
  1. +1 −3 web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala
@@ -709,10 +709,8 @@ class LiftSession(private[http] val _contextPath: String, val uniqueId: String,
w match {
// if it's going to a CometActor, batch up the commands
case Full(id) if asyncById.contains(id) => asyncById.get(id).toList.flatMap(a =>
- a.!?(a.cometProcessingTimeout, ActionMessageSet(f.map(i => buildFunc(i)), state)) match {
- case Full(li: List[_]) => li
+ a.!?(ActionMessageSet(f.map(i => buildFunc(i)), state)) match {
case li: List[_] => li
- case Empty => Full(a.cometProcessingTimeoutHandler())
case other => Nil
})
case _ => f.map(i => buildFunc(i).apply())

0 comments on commit d2ec29f

Please sign in to comment.