removed trailing whitespace

This commit is contained in:
Jonas Bonér 2010-11-24 21:05:12 +01:00
parent ba258e6a1c
commit 6cf7cc2986
10 changed files with 37 additions and 37 deletions

View file

@ -120,7 +120,7 @@ class ExecutorBasedEventDrivenDispatcher(
/** /**
* Creates and returns a durable mailbox for the given actor. * Creates and returns a durable mailbox for the given actor.
*/ */
private[akka] def createDurableMailbox(actorRef: ActorRef, mailboxType: DurableMailboxType): AnyRef = private[akka] def createDurableMailbox(actorRef: ActorRef, mailboxType: DurableMailboxType): AnyRef =
createMailbox(mailboxType.mailboxImplClassname, actorRef) createMailbox(mailboxType.mailboxImplClassname, actorRef)
private[akka] def start = log.slf4j.debug("Starting up {}\n\twith throughput [{}]", this, throughput) private[akka] def start = log.slf4j.debug("Starting up {}\n\twith throughput [{}]", this, throughput)

View file

@ -224,7 +224,7 @@ class ExecutorBasedEventDrivenWorkStealingDispatcher(
/** /**
* Creates and returns a durable mailbox for the given actor. * Creates and returns a durable mailbox for the given actor.
*/ */
private[akka] def createDurableMailbox(actorRef: ActorRef, mailboxType: DurableMailboxType): AnyRef = private[akka] def createDurableMailbox(actorRef: ActorRef, mailboxType: DurableMailboxType): AnyRef =
createMailbox(mailboxType.mailboxImplClassname, actorRef) createMailbox(mailboxType.mailboxImplClassname, actorRef)
private[akka] override def register(actorRef: ActorRef) = { private[akka] override def register(actorRef: ActorRef) = {

View file

@ -84,7 +84,7 @@ trait JettyContinuation extends ContinuationListener with akka.util.Logging
case None => false case None => false
case Some(continuation) => (continuation.isSuspended || (continuation.getAttribute(TimeoutAttribute) ne null)) case Some(continuation) => (continuation.isSuspended || (continuation.getAttribute(TimeoutAttribute) ne null))
} }
def timeout(ms:Long):Boolean = _continuation match { def timeout(ms:Long):Boolean = _continuation match {
case None => false case None => false
case Some(continuation) => case Some(continuation) =>

View file

@ -22,7 +22,7 @@ trait BootableRemoteActorService extends Bootable with Logging {
else RemoteNode.start else RemoteNode.start
} }
}, "Akka Remote Service") }, "Akka Remote Service")
def startRemoteService = remoteServerThread.start def startRemoteService = remoteServerThread.start
abstract override def onLoad = { abstract override def onLoad = {

View file

@ -290,15 +290,15 @@ class RemoteClient private[akka] (
else None else None
send(createRemoteMessageProtocolBuilder( send(createRemoteMessageProtocolBuilder(
Some(actorRef), Some(actorRef),
Left(actorRef.uuid), Left(actorRef.uuid),
actorRef.id, actorRef.id,
actorRef.actorClassName, actorRef.actorClassName,
actorRef.timeout, actorRef.timeout,
Left(message), Left(message),
isOneWay, isOneWay,
senderOption, senderOption,
typedActorInfo, typedActorInfo,
actorType, actorType,
cookie cookie
).build, senderFuture) ).build, senderFuture)
} }

View file

@ -161,16 +161,16 @@ case class RemoteServerStarted(
case class RemoteServerShutdown( case class RemoteServerShutdown(
@BeanProperty val server: RemoteServer) extends RemoteServerLifeCycleEvent @BeanProperty val server: RemoteServer) extends RemoteServerLifeCycleEvent
case class RemoteServerError( case class RemoteServerError(
@BeanProperty val cause: Throwable, @BeanProperty val cause: Throwable,
@BeanProperty val server: RemoteServer) extends RemoteServerLifeCycleEvent @BeanProperty val server: RemoteServer) extends RemoteServerLifeCycleEvent
case class RemoteServerClientConnected( case class RemoteServerClientConnected(
@BeanProperty val server: RemoteServer, @BeanProperty val server: RemoteServer,
@BeanProperty val clientAddress: Option[InetSocketAddress]) extends RemoteServerLifeCycleEvent @BeanProperty val clientAddress: Option[InetSocketAddress]) extends RemoteServerLifeCycleEvent
case class RemoteServerClientDisconnected( case class RemoteServerClientDisconnected(
@BeanProperty val server: RemoteServer, @BeanProperty val server: RemoteServer,
@BeanProperty val clientAddress: Option[InetSocketAddress]) extends RemoteServerLifeCycleEvent @BeanProperty val clientAddress: Option[InetSocketAddress]) extends RemoteServerLifeCycleEvent
case class RemoteServerClientClosed( case class RemoteServerClientClosed(
@BeanProperty val server: RemoteServer, @BeanProperty val server: RemoteServer,
@BeanProperty val clientAddress: Option[InetSocketAddress]) extends RemoteServerLifeCycleEvent @BeanProperty val clientAddress: Option[InetSocketAddress]) extends RemoteServerLifeCycleEvent
/** /**
@ -726,7 +726,7 @@ class RemoteServerHandler(
} }
private def findActorFactory(id: String) : () => ActorRef = { private def findActorFactory(id: String) : () => ActorRef = {
server.actorsFactories.get(id) server.actorsFactories.get(id)
} }
private def findSessionActor(id: String, channel: Channel) : ActorRef = { private def findSessionActor(id: String, channel: Channel) : ActorRef = {
@ -840,7 +840,7 @@ class RemoteServerHandler(
{ {
// the actor has not been registered globally. See if we have it in the session // the actor has not been registered globally. See if we have it in the session
val sessionActorRefOrNull = createSessionActor(actorInfo, channel) val sessionActorRefOrNull = createSessionActor(actorInfo, channel)
if (sessionActorRefOrNull ne null) if (sessionActorRefOrNull ne null)
sessionActorRefOrNull sessionActorRefOrNull
else // maybe it is a client managed actor else // maybe it is a client managed actor
createClientManagedActor(actorInfo) createClientManagedActor(actorInfo)
@ -863,7 +863,7 @@ class RemoteServerHandler(
newInstance newInstance
} }
else else
null null
} }
} }
@ -921,15 +921,15 @@ class RemoteServerHandler(
log.slf4j.debug("Could not invoke remote actor", exception) log.slf4j.debug("Could not invoke remote actor", exception)
val messageBuilder = RemoteActorSerialization.createRemoteMessageProtocolBuilder( val messageBuilder = RemoteActorSerialization.createRemoteMessageProtocolBuilder(
None, None,
Right(request.getUuid), Right(request.getUuid),
actorInfo.getId, actorInfo.getId,
actorInfo.getTarget, actorInfo.getTarget,
actorInfo.getTimeout, actorInfo.getTimeout,
Right(exception), Right(exception),
true, true,
None, None,
None, None,
actorType, actorType,
None) None)
if (request.hasSupervisorUuid) messageBuilder.setSupervisorUuid(request.getSupervisorUuid) if (request.hasSupervisorUuid) messageBuilder.setSupervisorUuid(request.getSupervisorUuid)
messageBuilder.build messageBuilder.build

View file

@ -299,9 +299,9 @@ object RemoteActorSerialization {
.setOneWay(isOneWay) .setOneWay(isOneWay)
message match { message match {
case Left(message) => case Left(message) =>
messageBuilder.setMessage(MessageSerializer.serialize(message)) messageBuilder.setMessage(MessageSerializer.serialize(message))
case Right(exception) => case Right(exception) =>
messageBuilder.setException(ExceptionProtocol.newBuilder messageBuilder.setException(ExceptionProtocol.newBuilder
.setClassname(exception.getClass.getName) .setClassname(exception.getClass.getName)
.setMessage(exception.getMessage) .setMessage(exception.getMessage)
@ -310,7 +310,7 @@ object RemoteActorSerialization {
secureCookie.foreach(messageBuilder.setCookie(_)) secureCookie.foreach(messageBuilder.setCookie(_))
actorRef.foreach { ref => actorRef.foreach { ref =>
ref.registerSupervisorAsRemoteActor.foreach { id => ref.registerSupervisorAsRemoteActor.foreach { id =>
messageBuilder.setSupervisorUuid( messageBuilder.setSupervisorUuid(
UuidProtocol.newBuilder UuidProtocol.newBuilder

View file

@ -4,7 +4,7 @@ import java.util.concurrent.{CountDownLatch, TimeUnit}
import org.scalatest.junit.JUnitSuite import org.scalatest.junit.JUnitSuite
import org.junit.{Test, Before, After} import org.junit.{Test, Before, After}
import akka.util._ import akka.util._
import akka.remote.{RemoteServer, RemoteClient} import akka.remote.{RemoteServer, RemoteClient}
import akka.actor.Actor._ import akka.actor.Actor._
import akka.actor.{ActorRegistry, ActorRef, Actor} import akka.actor.{ActorRegistry, ActorRef, Actor}

View file

@ -98,7 +98,7 @@ class ServerInitiatedRemoteTypedSessionActorSpec extends
it should "be able to unregister" in { it should "be able to unregister" in {
server.registerTypedPerSessionActor("my-service-1",TypedActor.newInstance(classOf[RemoteTypedSessionActor], classOf[RemoteTypedSessionActorImpl], 1000)) server.registerTypedPerSessionActor("my-service-1",TypedActor.newInstance(classOf[RemoteTypedSessionActor], classOf[RemoteTypedSessionActorImpl], 1000))
server.typedActorsFactories.get("my-service-1") should not be (null) server.typedActorsFactories.get("my-service-1") should not be (null)
server.unregisterTypedPerSessionActor("my-service-1") server.unregisterTypedPerSessionActor("my-service-1")
server.typedActorsFactories.get("my-service-1") should be (null) server.typedActorsFactories.get("my-service-1") should be (null)

View file

@ -111,7 +111,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val SLF4J_VERSION = "1.6.0" lazy val SLF4J_VERSION = "1.6.0"
lazy val JETTY_VERSION = "7.1.6.v20100715" lazy val JETTY_VERSION = "7.1.6.v20100715"
lazy val JAVAX_SERVLET_VERSION = "3.0" lazy val JAVAX_SERVLET_VERSION = "3.0"
// ------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------
// Dependencies // Dependencies
@ -138,7 +138,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val dispatch_json = "net.databinder" % "dispatch-json_2.8.0" % DISPATCH_VERSION % "compile" //LGPL v2 lazy val dispatch_json = "net.databinder" % "dispatch-json_2.8.0" % DISPATCH_VERSION % "compile" //LGPL v2
lazy val javax_servlet_30 = "org.glassfish" % "javax.servlet" % JAVAX_SERVLET_VERSION % "provided" //CDDL v1 lazy val javax_servlet_30 = "org.glassfish" % "javax.servlet" % JAVAX_SERVLET_VERSION % "provided" //CDDL v1
lazy val jetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "compile" //Eclipse license lazy val jetty = "org.eclipse.jetty" % "jetty-server" % JETTY_VERSION % "compile" //Eclipse license
lazy val jetty_util = "org.eclipse.jetty" % "jetty-util" % JETTY_VERSION % "compile" //Eclipse license lazy val jetty_util = "org.eclipse.jetty" % "jetty-util" % JETTY_VERSION % "compile" //Eclipse license
lazy val jetty_xml = "org.eclipse.jetty" % "jetty-xml" % JETTY_VERSION % "compile" //Eclipse license lazy val jetty_xml = "org.eclipse.jetty" % "jetty-xml" % JETTY_VERSION % "compile" //Eclipse license
@ -154,7 +154,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
lazy val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % JACKSON_VERSION % "compile" //ApacheV2 lazy val jackson = "org.codehaus.jackson" % "jackson-mapper-asl" % JACKSON_VERSION % "compile" //ApacheV2
lazy val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % JACKSON_VERSION % "compile" //ApacheV2 lazy val jackson_core = "org.codehaus.jackson" % "jackson-core-asl" % JACKSON_VERSION % "compile" //ApacheV2
lazy val jersey = "com.sun.jersey" % "jersey-core" % JERSEY_VERSION % "compile" //CDDL v1 lazy val jersey = "com.sun.jersey" % "jersey-core" % JERSEY_VERSION % "compile" //CDDL v1
lazy val jersey_json = "com.sun.jersey" % "jersey-json" % JERSEY_VERSION % "compile" //CDDL v1 lazy val jersey_json = "com.sun.jersey" % "jersey-json" % JERSEY_VERSION % "compile" //CDDL v1
lazy val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" //CDDL v1 lazy val jersey_server = "com.sun.jersey" % "jersey-server" % JERSEY_VERSION % "compile" //CDDL v1