Merge branch 'dispatcherimprovements' of git@github.com:jboner/akka into jans_dispatcher_changes

akka-comet/src/main/scala/BootableCometActorService.scala

@@ -43,8 +43,7 @@ trait BootableCometActorService extends Bootable with Logging {
       adapter.setHandleStaticResources(true)
       adapter.setServletInstance(new AkkaServlet)
       adapter.setContextPath(uri.getPath)
-      //Using autodetection for now
+      adapter.addInitParameter("cometSupport", "org.atmosphere.container.GrizzlyCometSupport")
-      //adapter.addInitParameter("cometSupport", "org.atmosphere.container.GrizzlyCometSupport")
       if (HOME.isDefined) adapter.setRootFolder(HOME.get + "/deploy/root")
       log.info("REST service root path [%s] and context path [%s]", adapter.getRootFolder, adapter.getContextPath)
 

akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala

@@ -62,19 +62,24 @@ class ExecutorBasedEventDrivenDispatcher(_name: String) extends MessageDispatche
   def dispatch(invocation: MessageInvocation) = if (active) {
     executor.execute(new Runnable() {
       def run = {
-        val lockedForDispatching = invocation.receiver._dispatcherLock.tryLock
+        var lockAcquiredOnce = false
-        if (lockedForDispatching) {
+        // this do-wile loop is required to prevent missing new messages between the end of the inner while
-          try {
+        // loop and releasing the lock
-            // Only dispatch if we got the lock. Otherwise another thread is already dispatching.
+        do {
-            var messageInvocation = invocation.receiver._mailbox.poll
+          if (invocation.receiver._dispatcherLock.tryLock) {
-            while (messageInvocation != null) {
+            lockAcquiredOnce = true
-              messageInvocation.invoke
+            try {
-              messageInvocation = invocation.receiver._mailbox.poll
+              // Only dispatch if we got the lock. Otherwise another thread is already dispatching.
+              var messageInvocation = invocation.receiver._mailbox.poll
+              while (messageInvocation != null) {
+                messageInvocation.invoke
+                messageInvocation = invocation.receiver._mailbox.poll
+              }
+            } finally {
+              invocation.receiver._dispatcherLock.unlock
             }
-          } finally {
-            invocation.receiver._dispatcherLock.unlock
           }
-        }
+        } while ((lockAcquiredOnce && !invocation.receiver._mailbox.isEmpty))
       }
     })
   } else throw new IllegalStateException("Can't submit invocations to dispatcher since it's not started")

akka-core/src/test/scala/ThreadBasedDispatcherTest.scala

@@ -78,7 +78,7 @@ class ThreadBasedDispatcherTest extends JUnitSuite {
     })
     dispatcher.start
     for (i <- 0 until 100) {
-      dispatcher.dispatch(new MessageInvocation(key1, new Integer(i), None, None, None))
+      dispatcher.dispatch(new MessageInvocation(key1, i, None, None, None))
     }
     assert(handleLatch.await(5, TimeUnit.SECONDS))
     assert(!threadingIssueDetected.get)

akka-security/src/main/scala/Security.scala

@@ -87,10 +87,11 @@ class AkkaSecurityFilterFactory extends ResourceFilterFactory with Logging {
     override def filter(request: ContainerRequest): ContainerRequest =
       rolesAllowed match {
         case Some(roles) => {
-          (authenticator !! (Authenticate(request, roles), 10000)).get.asInstanceOf[AnyRef] match {
+          (authenticator.!![AnyRef](Authenticate(request, roles), 10000)) match {
-            case OK => request
+            case Some(OK) => request
-            case r if r.isInstanceOf[Response] =>
+            case Some(r) if r.isInstanceOf[Response] =>
               throw new WebApplicationException(r.asInstanceOf[Response])
+            case None => throw new WebApplicationException(408)
             case x => {
               log.error("Authenticator replied with unexpected result [%s]", x);
               throw new WebApplicationException(Response.Status.INTERNAL_SERVER_ERROR)

project/build/AkkaProject.scala

@@ -42,7 +42,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
   // ------------------------------------------------------------
   // project versions
   val JERSEY_VERSION = "1.1.5"
-  val ATMO_VERSION = "0.6-SNAPSHOT"
+  val ATMO_VERSION = "0.5.4"
   val CASSANDRA_VERSION = "0.5.0"
 
   // ------------------------------------------------------------
@@ -359,7 +359,7 @@ class AkkaParent(info: ProjectInfo) extends DefaultProject(info) {
 
   def deployTask(info: ProjectInfo, toDir: Path) = task {
     val projectPath = info.projectPath.toString
-    val moduleName = projectPath.substring(projectPath.lastIndexOf('/') + 1, projectPath.length)
+    val moduleName = projectPath.substring(projectPath.lastIndexOf(System.getProperty("file.separator")) + 1, projectPath.length)
     // FIXME need to find out a way to grab these paths from the sbt system 
     val JAR_FILE_NAME = moduleName + "_%s-%s.jar".format(defScalaVersion.value, version)
     val JAR_FILE_PATH = projectPath + "/target/scala_%s/".format(defScalaVersion.value) + JAR_FILE_NAME