raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge branch 'master' of github.com:jboner/akka

Browse source
This commit is contained in:
Viktor Klang 2010-10-05 12:06:38 +02:00
commit 44903557ed
16 changed files with 1170 additions and 237 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-http/src/main/scala/AkkaCometServlet.scala
View file

@ -89,16 +89,14 @@ class AkkaServlet extends AtmosphereServlet {
addAtmosphereHandler("/*", servlet, new AkkaBroadcaster)
}
lazy val akkaCometResolver: CometSupportResolver = {
lazy val akkaCometResolver: CometSupportResolver = new DefaultCometSupportResolver(config) {
import scala.collection.JavaConversions._
new DefaultCometSupportResolver(config) {
lazy val desiredCometSupport =
Option(getInitParameter("cometSupport")) filter testClassExists map newCometSupport
lazy val desiredCometSupport =
Option(getInitParameter("cometSupport")) filter testClassExists map newCometSupport
override def resolve(useNativeIfPossible : Boolean, useBlockingAsDefault : Boolean) : CometSupport[_ <: AtmosphereResource[_,_]] =
desiredCometSupport.getOrElse(super.resolve(useNativeIfPossible, useBlockingAsDefault))
}
override def resolve(useNativeIfPossible : Boolean, useBlockingAsDefault : Boolean) : CometSupport[_ <: AtmosphereResource[_,_]] =
desiredCometSupport.getOrElse(super.resolve(useNativeIfPossible, useBlockingAsDefault))
}
override def createCometSupportResolver() = akkaCometResolver