Permalink
Browse files

Revert "Rename continuation-related code to clarify Comet association."

This reverts commit 0f7b081.
  • Loading branch information...
1 parent 30d97e0 commit bb80eab94092311a5d60ae373eaa8e1fedc389f1 @fmpwizard fmpwizard committed Aug 31, 2012
Showing with 8 additions and 8 deletions.
  1. +8 −8 web/webkit/src/main/scala/net/liftweb/http/LiftServlet.scala
@@ -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)],
onBreakout: List[AnswerRender] => Unit) extends LiftActor {
private var answers: List[AnswerRender] = Nil
@@ -529,15 +529,15 @@ class LiftServlet extends Loggable {
case _ =>
}
- override def toString = "Continuation Actor dude " + seqId
+ override def toString = "Actor dude " + seqId
}
private object BeginContinuation
private lazy val cometTimeout: Long = (LiftRules.cometRequestTimeout openOr 120) * 1000L
- private def setupCometContinuation(request: Req, session: LiftSession, actors: List[(LiftCometActor, Long)]): Any = {
- val cont = new CometContinuationActor(request, session, actors,
+ private def setupContinuation(request: Req, session: LiftSession, actors: List[(LiftCometActor, Long)]): Any = {
+ val cont = new ContinuationActor(request, session, actors,
answers => request.request.resume(
(request, S.init(request, session)
(LiftRules.performTransform(
@@ -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))
else requestState.request.suspendResumeSupport_? match {
case true => {
- setupCometContinuation(requestState, sessionActor, actors)
+ setupContinuation(requestState, sessionActor, actors)
Left(Full(EmptyResponse))
}
@@ -614,7 +614,7 @@ class LiftServlet extends Loggable {
private def handleNonContinuationComet(request: Req, session: LiftSession, actors: List[(LiftCometActor, Long)],
originalRequest: Req): () => Box[LiftResponse] = () => {
val f = new LAFuture[List[AnswerRender]]
- val cont = new CometContinuationActor(request, session, actors,
+ val cont = new ContinuationActor(request, session, actors,
answers => f.satisfy(answers))
try {

0 comments on commit bb80eab

Please sign in to comment.