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

Updated to latest Atmosphere API

Browse source
This commit is contained in:
Viktor Klang 2009-12-13 20:01:33 +01:00
parent 162a9a8233
commit c614574f3e
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-actors/src/main/scala/nio/Cluster.scala
View file

@ -49,7 +49,7 @@ object Cluster extends Cluster {
Supervise(actor, LifeCycle(Permanent)):: Nil
)
).newInstance.start
actor !! Init(None) // FIXME for some reason the actor isn't init:ed unless we explicitly send it this Init message
//actor !! Init(None) // FIXME for some reason the actor isn't init:ed unless we explicitly send it this Init message
actor
})
}

6
akka-kernel/src/main/scala/AkkaServlet.scala
View file

@ -18,7 +18,7 @@ import javax.servlet.{ServletConfig}
import javax.servlet.http.{HttpServletRequest, HttpServletResponse}
import org.atmosphere.cpr.{AtmosphereServlet, AtmosphereServletProcessor, AtmosphereResource, AtmosphereResourceEvent,CometSupport,CometSupportResolver,DefaultCometSupportResolver}
import org.atmosphere.container.{GrizzlyCometSupport,GlassFishv3CometSupport}
import org.atmosphere.container.{GrizzlyCometSupport}
import org.atmosphere.handler.{ReflectorServletProcessor, AbstractReflectorAtmosphereHandler}
import org.atmosphere.jersey.JerseyBroadcaster
@ -85,9 +85,9 @@ class AkkaCometServlet extends org.atmosphere.cpr.AtmosphereServlet with Logging
new DefaultCometSupportResolver(config) {
type CS = CometSupport[_ <: AtmosphereResource[_,_]]
override def resolveMultipleNativeSupportConflict(available : JList[Class[_ <: CS]]) : CS = {
available.asScala.filter(c => c != classOf[GrizzlyCometSupport] && c != classOf[GlassFishv3CometSupport]).toList match {
available.asScala.filter(_ != classOf[GrizzlyCometSupport]).toList match {
case Nil => new GrizzlyCometSupport(config)
case x :: Nil => newCometSupport(x)
case (x:AnyRef) :: Nil => newCometSupport(x)
case _ => super.resolveMultipleNativeSupportConflict(available)
}
}