Skip to content

Commit

Permalink
Revert "Rename continuation-related code to clarify Comet association."
Browse files Browse the repository at this point in the history
This reverts commit 0f7b081.
  • Loading branch information
fmpwizard committed Aug 31, 2012
1 parent 30d97e0 commit bb80eab
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions web/webkit/src/main/scala/net/liftweb/http/LiftServlet.scala
Expand Up @@ -496,10 +496,10 @@ class LiftServlet extends Loggable {
} }
} }


/** /**
* An actor that manages comet continuations from container (Jetty style) * An actor that manages continuations from container (Jetty style)
*/ */
class CometContinuationActor(request: Req, session: LiftSession, class ContinuationActor(request: Req, session: LiftSession,
actors: List[(LiftCometActor, Long)], actors: List[(LiftCometActor, Long)],
onBreakout: List[AnswerRender] => Unit) extends LiftActor { onBreakout: List[AnswerRender] => Unit) extends LiftActor {
private var answers: List[AnswerRender] = Nil private var answers: List[AnswerRender] = Nil
Expand Down Expand Up @@ -529,15 +529,15 @@ class LiftServlet extends Loggable {
case _ => case _ =>
} }


override def toString = "Continuation Actor dude " + seqId override def toString = "Actor dude " + seqId
} }


private object BeginContinuation private object BeginContinuation


private lazy val cometTimeout: Long = (LiftRules.cometRequestTimeout openOr 120) * 1000L private lazy val cometTimeout: Long = (LiftRules.cometRequestTimeout openOr 120) * 1000L


private def setupCometContinuation(request: Req, session: LiftSession, actors: List[(LiftCometActor, Long)]): Any = { private def setupContinuation(request: Req, session: LiftSession, actors: List[(LiftCometActor, Long)]): Any = {
val cont = new CometContinuationActor(request, session, actors, val cont = new ContinuationActor(request, session, actors,
answers => request.request.resume( answers => request.request.resume(
(request, S.init(request, session) (request, S.init(request, session)
(LiftRules.performTransform( (LiftRules.performTransform(
Expand Down Expand Up @@ -566,7 +566,7 @@ class LiftServlet extends Loggable {
if (actors.isEmpty) Left(Full(new JsCommands(LiftRules.noCometSessionCmd.vend :: js.JE.JsRaw("lift_toWatch = {};").cmd :: Nil).toResponse)) if (actors.isEmpty) Left(Full(new JsCommands(LiftRules.noCometSessionCmd.vend :: js.JE.JsRaw("lift_toWatch = {};").cmd :: Nil).toResponse))
else requestState.request.suspendResumeSupport_? match { else requestState.request.suspendResumeSupport_? match {
case true => { case true => {
setupCometContinuation(requestState, sessionActor, actors) setupContinuation(requestState, sessionActor, actors)
Left(Full(EmptyResponse)) Left(Full(EmptyResponse))
} }


Expand Down Expand Up @@ -614,7 +614,7 @@ class LiftServlet extends Loggable {
private def handleNonContinuationComet(request: Req, session: LiftSession, actors: List[(LiftCometActor, Long)], private def handleNonContinuationComet(request: Req, session: LiftSession, actors: List[(LiftCometActor, Long)],
originalRequest: Req): () => Box[LiftResponse] = () => { originalRequest: Req): () => Box[LiftResponse] = () => {
val f = new LAFuture[List[AnswerRender]] val f = new LAFuture[List[AnswerRender]]
val cont = new CometContinuationActor(request, session, actors, val cont = new ContinuationActor(request, session, actors,
answers => f.satisfy(answers)) answers => f.satisfy(answers))


try { try {
Expand Down

0 comments on commit bb80eab

Please sign in to comment.