From c614574f3e28999eb207b3dfebd9dc60dc52e45f Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Sun, 13 Dec 2009 20:01:33 +0100
Subject: [PATCH] Updated to latest Atmosphere API

---
 akka-actors/src/main/scala/nio/Cluster.scala | 2 +-
 akka-kernel/src/main/scala/AkkaServlet.scala | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/akka-actors/src/main/scala/nio/Cluster.scala b/akka-actors/src/main/scala/nio/Cluster.scala
index 54dc85dd8e..55d4970f48 100644
--- a/akka-actors/src/main/scala/nio/Cluster.scala
+++ b/akka-actors/src/main/scala/nio/Cluster.scala
@@ -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
         })
       }
diff --git a/akka-kernel/src/main/scala/AkkaServlet.scala b/akka-kernel/src/main/scala/AkkaServlet.scala
index 32a9b18295..ae69fc21a7 100755
--- a/akka-kernel/src/main/scala/AkkaServlet.scala
+++ b/akka-kernel/src/main/scala/AkkaServlet.scala
@@ -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)
              }
         }