Skip to content

Commit ec0d62b

Browse files
Merge pull request #1916 from lift/302-comet-creation
[3.0.2] Comet creation backport
2 parents 046e400 + 3034746 commit ec0d62b

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

web/webkit/src/main/scala/net/liftweb/http/LiftSession.scala

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2417,8 +2417,9 @@ class LiftSession(private[http] val _contextPath: String, val underlyingId: Stri
24172417
/**
24182418
* As with `findOrBuildComet[T]`, but specify the type as a `String`. If the
24192419
* comet doesn't already exist, the comet type is first looked up via
2420-
* `LiftRules.cometCreationFactory`, and then as a class name in the comet
2421-
* packages designated by `LiftRules.buildPackage("comet")`.
2420+
* `LiftRules.cometCreationFactory`, then `LiftRules.cometCreation`, and
2421+
* finally as a class name in the comet packages designated by
2422+
* `LiftRules.buildPackage("comet")`.
24222423
*/
24232424
private[http] def findOrCreateComet(
24242425
cometType: String,
@@ -2493,12 +2494,14 @@ class LiftSession(private[http] val _contextPath: String, val underlyingId: Stri
24932494
}
24942495

24952496
// Given a comet creation info, build a comet based on the comet type, first
2496-
// attempting to use LiftRules.cometCreationFactory and then building it by
2497+
// attempting to use `LiftRules.cometCreationFactory` and then attempting to
2498+
// find a match in `LiftRules.cometCreation`. Failing those, this will build it by
24972499
// class name. Return a descriptive Failure if it's all gone sideways.
24982500
//
24992501
// Runs some base setup tasks before returning the comet.
25002502
private def buildCometByCreationInfo(creationInfo: CometCreationInfo): Box[LiftCometActor] = {
2501-
LiftRules.cometCreationFactory.vend.apply(creationInfo) or {
2503+
LiftRules.cometCreationFactory.vend.apply(creationInfo) or
2504+
NamedPF.applyBox(creationInfo, LiftRules.cometCreation.toList) or {
25022505
val cometType =
25032506
findType[LiftCometActor](
25042507
creationInfo.cometType,

0 commit comments

Comments
 (0)