diff --git a/web/webkit/src/main/scala/net/liftweb/builtin/comet/AsyncRenderComet.scala b/web/webkit/src/main/scala/net/liftweb/builtin/comet/AsyncRenderComet.scala index efbf2a11ba..900aef014b 100644 --- a/web/webkit/src/main/scala/net/liftweb/builtin/comet/AsyncRenderComet.scala +++ b/web/webkit/src/main/scala/net/liftweb/builtin/comet/AsyncRenderComet.scala @@ -35,12 +35,10 @@ private case class Render(js: JsCmd) * * None of these requires explicit use of `buildDeferredFunction`. */ -class AsyncRenderComet extends CometActor { +class AsyncRenderComet extends MessageCometActor { override def lifespan: Box[TimeSpan] = Full(90.seconds) - def render = NodeSeq.Empty - // make this method visible so that we can initialize the actor override def initCometActor(creationInfo: CometCreationInfo) { super.initCometActor(creationInfo) diff --git a/web/webkit/src/main/scala/net/liftweb/http/CometActor.scala b/web/webkit/src/main/scala/net/liftweb/http/CometActor.scala index 9c1db69471..f3d234e101 100644 --- a/web/webkit/src/main/scala/net/liftweb/http/CometActor.scala +++ b/web/webkit/src/main/scala/net/liftweb/http/CometActor.scala @@ -296,8 +296,8 @@ abstract class LiftActorJWithListenerManager extends LiftActorJ with ListenerMan * * @see ListenerManager */ -trait CometListener extends CometActor { - self: CometActor => +trait CometListener extends BaseCometActor { + self: BaseCometActor => /** * This controls which Actor to register with for updates. Typically diff --git a/web/webkit/src/main/scala/net/liftweb/http/NamedCometActorTrait.scala b/web/webkit/src/main/scala/net/liftweb/http/NamedCometActorTrait.scala index cd0ed76314..3fe0ec3dba 100644 --- a/web/webkit/src/main/scala/net/liftweb/http/NamedCometActorTrait.scala +++ b/web/webkit/src/main/scala/net/liftweb/http/NamedCometActorTrait.scala @@ -21,7 +21,7 @@ import util.Helpers._ import common.{Loggable, Full} -trait NamedCometActorTrait extends CometActor with Loggable { +trait NamedCometActorTrait extends BaseCometActor with Loggable { /** * First thing we do is registering this comet actor diff --git a/web/webkit/src/main/scala/net/liftweb/http/NamedCometDispatcher.scala b/web/webkit/src/main/scala/net/liftweb/http/NamedCometDispatcher.scala index eff4fd40eb..5d9bc12065 100644 --- a/web/webkit/src/main/scala/net/liftweb/http/NamedCometDispatcher.scala +++ b/web/webkit/src/main/scala/net/liftweb/http/NamedCometDispatcher.scala @@ -27,7 +27,7 @@ class NamedCometDispatcher(name: Box[String]) extends LiftActor with Loggable { logger.debug("DispatcherActor got name: %s".format(name)) - private var cometActorsToUpdate: Vector[CometActor]= Vector() + private var cometActorsToUpdate: Vector[BaseCometActor]= Vector() override def messageHandler = { /** @@ -69,6 +69,6 @@ class NamedCometDispatcher(name: Box[String]) extends LiftActor with Loggable { * register each named comet actor with a dispatcher that * only updates the specific version it monitors */ -case class registerCometActor(actor: CometActor, name: Box[String]) -case class unregisterCometActor(actor: CometActor) +case class registerCometActor(actor: BaseCometActor, name: Box[String]) +case class unregisterCometActor(actor: BaseCometActor) case class CometName(name: String)