From f9c3f7b42bad91cd4c1ad21000c49b6f95609de3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Fri, 2 Jul 2010 11:14:49 +0200 Subject: [PATCH 1/2] Changed Akka to use IllegalActorStateException instead of IllegalStateException --- akka-http/src/main/scala/Security.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-http/src/main/scala/Security.scala b/akka-http/src/main/scala/Security.scala index f550177965..b0f3c10be0 100644 --- a/akka-http/src/main/scala/Security.scala +++ b/akka-http/src/main/scala/Security.scala @@ -22,7 +22,7 @@ package se.scalablesolutions.akka.security -import se.scalablesolutions.akka.actor.{Scheduler, Actor, ActorRef, ActorRegistry} +import se.scalablesolutions.akka.actor.{Scheduler, Actor, ActorRef, ActorRegistry, IllegalActorStateException} import se.scalablesolutions.akka.actor.Actor._ import se.scalablesolutions.akka.config.Config import se.scalablesolutions.akka.util.Logging @@ -102,7 +102,7 @@ class AkkaSecurityFilterFactory extends ResourceFilterFactory with Logging { lazy val authenticatorFQN = { val auth = Config.config.getString("akka.rest.authenticator", "N/A") - if (auth == "N/A") throw new IllegalStateException("The config option 'akka.rest.authenticator' is not defined in 'akka.conf'") + if (auth == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.authenticator' is not defined in 'akka.conf'") auth } @@ -400,7 +400,7 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] w */ lazy val servicePrincipal = { val p = Config.config.getString("akka.rest.kerberos.servicePrincipal", "N/A") - if (p == "N/A") throw new IllegalStateException("The config option 'akka.rest.kerberos.servicePrincipal' is not defined in 'akka.conf'") + if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.servicePrincipal' is not defined in 'akka.conf'") p } @@ -409,13 +409,13 @@ trait SpnegoAuthenticationActor extends AuthenticationActor[SpnegoCredentials] w */ lazy val keyTabLocation = { val p = Config.config.getString("akka.rest.kerberos.keyTabLocation", "N/A") - if (p == "N/A") throw new IllegalStateException("The config option 'akka.rest.kerberos.keyTabLocation' is not defined in 'akka.conf'") + if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.keyTabLocation' is not defined in 'akka.conf'") p } lazy val kerberosDebug = { val p = Config.config.getString("akka.rest.kerberos.kerberosDebug", "N/A") - if (p == "N/A") throw new IllegalStateException("The config option 'akka.rest.kerberos.kerberosDebug' is not defined in 'akka.conf'") + if (p == "N/A") throw new IllegalActorStateException("The config option 'akka.rest.kerberos.kerberosDebug' is not defined in 'akka.conf'") p } From 4522f18effb97f3fc46de66d5f388f5bdeb182c3 Mon Sep 17 00:00:00 2001 From: Heiko Seeberger Date: Fri, 2 Jul 2010 22:37:26 +0200 Subject: [PATCH 2/2] re #290: Added parens to no-parameter methods returning Unit in all subprojects. --- akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala index a4dffdea94..775c8b554d 100644 --- a/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala +++ b/akka-http/src/main/scala/AkkaClusterBroadcastFilter.scala @@ -27,7 +27,7 @@ class AkkaClusterBroadcastFilter extends Actor with ClusterBroadcastFilter { /** * Stops the actor */ - def destroy: Unit = self.stop + def destroy(): Unit = self.stop /** * Relays all non ClusterCometBroadcast messages to the other AkkaClusterBroadcastFilters in the cluster