diff --git a/akka-amqp/src/main/scala/AMQP.scala b/akka-amqp/src/main/scala/AMQP.scala
index 8605401dbd..0bfbd93063 100644
--- a/akka-amqp/src/main/scala/AMQP.scala
+++ b/akka-amqp/src/main/scala/AMQP.scala
@@ -136,8 +136,8 @@ object AMQP {
def toBinary(t: T): Array[Byte]
}
-
+
case class RpcClientSerializer[O,I](toBinary: ToBinary[O], fromBinary: FromBinary[I])
-
+
case class RpcServerSerializer[I,O](fromBinary: FromBinary[I], toBinary: ToBinary[O])
}
diff --git a/akka-amqp/src/main/scala/ConsumerActor.scala b/akka-amqp/src/main/scala/ConsumerActor.scala
index 26d1ac00db..d394e9d997 100644
--- a/akka-amqp/src/main/scala/ConsumerActor.scala
+++ b/akka-amqp/src/main/scala/ConsumerActor.scala
@@ -14,7 +14,7 @@ import java.lang.Throwable
private[amqp] class ConsumerActor(consumerParameters: ConsumerParameters)
extends FaultTolerantChannelActor(consumerParameters.exchangeParameters, consumerParameters.channelParameters) {
-
+
import consumerParameters._
import exchangeParameters._
diff --git a/akka-amqp/src/main/scala/FaultTolerantChannelActor.scala b/akka-amqp/src/main/scala/FaultTolerantChannelActor.scala
index 40bcd5de57..5ecae4c6d3 100644
--- a/akka-amqp/src/main/scala/FaultTolerantChannelActor.scala
+++ b/akka-amqp/src/main/scala/FaultTolerantChannelActor.scala
@@ -14,7 +14,7 @@ import se.scalablesolutions.akka.amqp.AMQP.{ExchangeParameters, ChannelParameter
abstract private[amqp] class FaultTolerantChannelActor(
exchangeParameters: ExchangeParameters, channelParameters: Option[ChannelParameters]) extends Actor {
-
+
import exchangeParameters._
protected[amqp] var channel: Option[Channel] = None
@@ -104,4 +104,4 @@ abstract private[amqp] class FaultTolerantChannelActor(
}
override def shutdown = closeChannel
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/main/scala/ProducerActor.scala b/akka-amqp/src/main/scala/ProducerActor.scala
index db290a5ac1..48a6be0a94 100644
--- a/akka-amqp/src/main/scala/ProducerActor.scala
+++ b/akka-amqp/src/main/scala/ProducerActor.scala
@@ -9,7 +9,7 @@ import se.scalablesolutions.akka.amqp.AMQP.ProducerParameters
private[amqp] class ProducerActor(producerParameters: ProducerParameters)
extends FaultTolerantChannelActor(producerParameters.exchangeParameters, producerParameters.channelParameters) {
-
+
import producerParameters._
import exchangeParameters._
diff --git a/akka-amqp/src/main/scala/RpcClientActor.scala b/akka-amqp/src/main/scala/RpcClientActor.scala
index ba85005777..2935982a67 100644
--- a/akka-amqp/src/main/scala/RpcClientActor.scala
+++ b/akka-amqp/src/main/scala/RpcClientActor.scala
@@ -40,4 +40,4 @@ class RpcClientActor[I,O](exchangeParameters: ExchangeParameters,
}
override def toString = "AMQP.RpcClient[exchange=" +exchangeName + ", routingKey=" + routingKey+ "]"
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/main/scala/RpcServerActor.scala b/akka-amqp/src/main/scala/RpcServerActor.scala
index 897c041c69..c64ef9058e 100644
--- a/akka-amqp/src/main/scala/RpcServerActor.scala
+++ b/akka-amqp/src/main/scala/RpcServerActor.scala
@@ -31,4 +31,4 @@ class RpcServerActor[I,O](producer: ActorRef, serializer: RpcServerSerializer[I,
override def toString(): String =
"AMQP.RpcServer[]"
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPConnectionRecoveryTest.scala b/akka-amqp/src/test/scala/AMQPConnectionRecoveryTest.scala
index 3bc2cb20dd..c1af35546a 100644
--- a/akka-amqp/src/test/scala/AMQPConnectionRecoveryTest.scala
+++ b/akka-amqp/src/test/scala/AMQPConnectionRecoveryTest.scala
@@ -56,4 +56,4 @@ class AMQPConnectionRecoveryTest extends JUnitSuite with MustMatchers with Loggi
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPConsumerChannelRecoveryTest.scala b/akka-amqp/src/test/scala/AMQPConsumerChannelRecoveryTest.scala
index 0f6fadfcc4..a0b44f4739 100644
--- a/akka-amqp/src/test/scala/AMQPConsumerChannelRecoveryTest.scala
+++ b/akka-amqp/src/test/scala/AMQPConsumerChannelRecoveryTest.scala
@@ -67,4 +67,4 @@ class AMQPConsumerChannelRecoveryTest extends JUnitSuite with MustMatchers with
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPConsumerConnectionRecoveryTest.scala b/akka-amqp/src/test/scala/AMQPConsumerConnectionRecoveryTest.scala
index 9dccd43be8..bf4885fea5 100644
--- a/akka-amqp/src/test/scala/AMQPConsumerConnectionRecoveryTest.scala
+++ b/akka-amqp/src/test/scala/AMQPConsumerConnectionRecoveryTest.scala
@@ -86,4 +86,4 @@ class AMQPConsumerConnectionRecoveryTest extends JUnitSuite with MustMatchers wi
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPConsumerManualAcknowledgeTest.scala b/akka-amqp/src/test/scala/AMQPConsumerManualAcknowledgeTest.scala
index d48f38afc5..2dc4ee939b 100644
--- a/akka-amqp/src/test/scala/AMQPConsumerManualAcknowledgeTest.scala
+++ b/akka-amqp/src/test/scala/AMQPConsumerManualAcknowledgeTest.scala
@@ -64,4 +64,4 @@ class AMQPConsumerManualAcknowledgeTest extends JUnitSuite with MustMatchers wit
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPConsumerMessageTest.scala b/akka-amqp/src/test/scala/AMQPConsumerMessageTest.scala
index af94b0a515..5d34f867d6 100644
--- a/akka-amqp/src/test/scala/AMQPConsumerMessageTest.scala
+++ b/akka-amqp/src/test/scala/AMQPConsumerMessageTest.scala
@@ -38,7 +38,7 @@ class AMQPConsumerMessageTest extends JUnitSuite with MustMatchers with Logging
val producer = AMQP.newProducer(connection,
ProducerParameters(exchangeParameters, channelParameters = Some(channelParameters)))
-
+
countDown.await(2, TimeUnit.SECONDS) must be (true)
producer ! Message("some_payload".getBytes, "non.interesting.routing.key")
payloadLatch.tryAwait(2, TimeUnit.SECONDS) must be (true)
@@ -53,4 +53,4 @@ class AMQPConsumerMessageTest extends JUnitSuite with MustMatchers with Logging
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPProducerChannelRecoveryTest.scala b/akka-amqp/src/test/scala/AMQPProducerChannelRecoveryTest.scala
index 095a21fc86..26b2d78393 100644
--- a/akka-amqp/src/test/scala/AMQPProducerChannelRecoveryTest.scala
+++ b/akka-amqp/src/test/scala/AMQPProducerChannelRecoveryTest.scala
@@ -60,4 +60,4 @@ class AMQPProducerChannelRecoveryTest extends JUnitSuite with MustMatchers with
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPProducerConnectionRecoveryTest.scala b/akka-amqp/src/test/scala/AMQPProducerConnectionRecoveryTest.scala
index 71bc08bdaa..fe8259b208 100644
--- a/akka-amqp/src/test/scala/AMQPProducerConnectionRecoveryTest.scala
+++ b/akka-amqp/src/test/scala/AMQPProducerConnectionRecoveryTest.scala
@@ -59,4 +59,4 @@ class AMQPProducerConnectionRecoveryTest extends JUnitSuite with MustMatchers wi
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPProducerMessageTest.scala b/akka-amqp/src/test/scala/AMQPProducerMessageTest.scala
index ab9bb00e7c..5b19df351f 100644
--- a/akka-amqp/src/test/scala/AMQPProducerMessageTest.scala
+++ b/akka-amqp/src/test/scala/AMQPProducerMessageTest.scala
@@ -21,7 +21,7 @@ class AMQPProducerMessageTest extends JUnitSuite with MustMatchers with Logging
@Test
def producerMessage = if (AMQPTest.enabled) {
-
+
val connection: ActorRef = AMQP.newConnection()
try {
val returnLatch = new StandardLatch
@@ -48,4 +48,4 @@ class AMQPProducerMessageTest extends JUnitSuite with MustMatchers with Logging
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPRpcClientServerTest.scala b/akka-amqp/src/test/scala/AMQPRpcClientServerTest.scala
index 7dbfb4becd..dcaec4cd06 100644
--- a/akka-amqp/src/test/scala/AMQPRpcClientServerTest.scala
+++ b/akka-amqp/src/test/scala/AMQPRpcClientServerTest.scala
@@ -68,4 +68,4 @@ class AMQPRpcClientServerTest extends JUnitSuite with MustMatchers with Logging
// this dummy test makes sure that the whole test class doesn't fail because of missing tests
assert(true)
}
-}
\ No newline at end of file
+}
diff --git a/akka-amqp/src/test/scala/AMQPTest.scala b/akka-amqp/src/test/scala/AMQPTest.scala
index e50ab673f6..5ff9157bc5 100644
--- a/akka-amqp/src/test/scala/AMQPTest.scala
+++ b/akka-amqp/src/test/scala/AMQPTest.scala
@@ -6,4 +6,4 @@ package se.scalablesolutions.akka.amqp.test
object AMQPTest {
def enabled = false
-}
\ No newline at end of file
+}
diff --git a/akka-camel/src/main/scala/CamelService.scala b/akka-camel/src/main/scala/CamelService.scala
index 0fbbceee2e..8f3e504dfd 100644
--- a/akka-camel/src/main/scala/CamelService.scala
+++ b/akka-camel/src/main/scala/CamelService.scala
@@ -82,7 +82,7 @@ trait CamelService extends Bootable with Logging {
/**
* Sets an expectation of the number of upcoming endpoint activations and returns
* a {@link CountDownLatch} that can be used to wait for the activations to occur.
- * Endpoint activations that occurred in the past are not considered.
+ * Endpoint activations that occurred in the past are not considered.
*/
def expectEndpointActivationCount(count: Int): CountDownLatch =
(consumerPublisher !! SetExpectedRegistrationCount(count)).as[CountDownLatch].get
diff --git a/akka-camel/src/main/scala/Consumer.scala b/akka-camel/src/main/scala/Consumer.scala
index e5218a21f2..1f7dffc91b 100644
--- a/akka-camel/src/main/scala/Consumer.scala
+++ b/akka-camel/src/main/scala/Consumer.scala
@@ -42,4 +42,4 @@ private[camel] object Consumer {
else if (actorRef.remoteAddress.isDefined) None
else Some(f(actorRef.actor.asInstanceOf[Consumer]))
}
-}
\ No newline at end of file
+}
diff --git a/akka-camel/src/main/scala/component/ActorComponent.scala b/akka-camel/src/main/scala/component/ActorComponent.scala
index 6baeaf8b3e..1cd29ced00 100644
--- a/akka-camel/src/main/scala/component/ActorComponent.scala
+++ b/akka-camel/src/main/scala/component/ActorComponent.scala
@@ -261,4 +261,4 @@ private[akka] class AsyncCallbackAdapter(exchange: Exchange, callback: AsyncCall
protected[this] def actorInstance: AtomicReference[Actor] = unsupported
private def unsupported = throw new UnsupportedOperationException("Not supported for %s" format classOf[AsyncCallbackAdapter].getName)
-}
\ No newline at end of file
+}
diff --git a/akka-camel/src/test/scala/CamelServiceFeatureTest.scala b/akka-camel/src/test/scala/CamelServiceFeatureTest.scala
index 1fcbcadd64..753730659e 100644
--- a/akka-camel/src/test/scala/CamelServiceFeatureTest.scala
+++ b/akka-camel/src/test/scala/CamelServiceFeatureTest.scala
@@ -135,7 +135,7 @@ class CamelServiceFeatureTest extends FeatureSpec with BeforeAndAfterAll with Gi
assert(response2 === "m3base: x y")
assert(response3 === "m4base: x y")
- // cleanup to avoid conflicts with next test (i.e. avoid multiple consumers on direct-endpoints)
+ // cleanup to avoid conflicts with next test (i.e. avoid multiple consumers on direct-endpoints)
latch = service.expectEndpointDeactivationCount(3)
TypedActor.stop(obj)
assert(latch.await(5000, TimeUnit.MILLISECONDS))
diff --git a/akka-camel/src/test/scala/ProducerFeatureTest.scala b/akka-camel/src/test/scala/ProducerFeatureTest.scala
index 5cf24eaaa3..d238286f9c 100644
--- a/akka-camel/src/test/scala/ProducerFeatureTest.scala
+++ b/akka-camel/src/test/scala/ProducerFeatureTest.scala
@@ -298,4 +298,4 @@ object ProducerFeatureTest {
})
}
}
-}
\ No newline at end of file
+}
diff --git a/akka-camel/src/test/scala/component/ActorProducerTest.scala b/akka-camel/src/test/scala/component/ActorProducerTest.scala
index 300d0ca617..5e8a674e55 100644
--- a/akka-camel/src/test/scala/component/ActorProducerTest.scala
+++ b/akka-camel/src/test/scala/component/ActorProducerTest.scala
@@ -116,4 +116,4 @@ object ActorProducerTest {
}
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala
index 1de3997c12..60210e5d6d 100644
--- a/akka-core/src/main/scala/actor/Actor.scala
+++ b/akka-core/src/main/scala/actor/Actor.scala
@@ -415,7 +415,7 @@ trait Actor extends Logging {
* Is the actor able to handle the message passed in as arguments?
*/
def isDefinedAt(message: Any): Boolean = base.isDefinedAt(message)
-
+
/** One of the fundamental methods of the ActorsModel
* Actor assumes a new behavior
*/
diff --git a/akka-core/src/main/scala/actor/ActorRef.scala b/akka-core/src/main/scala/actor/ActorRef.scala
index ca55d6c1fa..e84c0cfa6f 100644
--- a/akka-core/src/main/scala/actor/ActorRef.scala
+++ b/akka-core/src/main/scala/actor/ActorRef.scala
@@ -416,13 +416,13 @@ trait ActorRef extends TransactionManagement {
* Returns the home address and port for this actor.
*/
def homeAddress: InetSocketAddress = _homeAddress
-
+
/**
* Set the home address and port for this actor.
*/
def homeAddress_=(hostnameAndPort: Tuple2[String, Int]): Unit =
homeAddress_=(new InetSocketAddress(hostnameAndPort._1, hostnameAndPort._2))
-
+
/**
* Set the home address and port for this actor.
*/
@@ -962,7 +962,7 @@ sealed class LocalActorRef private[akka](
throw e
} finally {
currentMessage = None //TODO: Don't reset this, we might want to resend the message
- }
+ }
}
}
@@ -987,20 +987,20 @@ sealed class LocalActorRef private[akka](
protected[akka] def restart(reason: Throwable, maxNrOfRetries: Int, withinTimeRange: Int): Unit = {
if (maxNrOfRetriesCount == 0) restartsWithinTimeRangeTimestamp = System.currentTimeMillis // first time around
maxNrOfRetriesCount += 1
-
+
val tooManyRestarts = maxNrOfRetriesCount > maxNrOfRetries
val restartingHasExpired = (System.currentTimeMillis - restartsWithinTimeRangeTimestamp) > withinTimeRange
if (tooManyRestarts || restartingHasExpired) {
val notification = MaximumNumberOfRestartsWithinTimeRangeReached(this, maxNrOfRetries, withinTimeRange, reason)
Actor.log.warning(
- "Maximum number of restarts [%s] within time range [%s] reached." +
- "\n\tWill *not* restart actor [%s] anymore." +
- "\n\tLast exception causing restart was" +
- "\n\t[%s].",
+ "Maximum number of restarts [%s] within time range [%s] reached." +
+ "\n\tWill *not* restart actor [%s] anymore." +
+ "\n\tLast exception causing restart was" +
+ "\n\t[%s].",
maxNrOfRetries, withinTimeRange, this, reason)
- _supervisor.foreach { sup =>
+ _supervisor.foreach { sup =>
// can supervisor handle the notification?
- if (sup.isDefinedAt(notification)) notifySupervisorWithMessage(notification)
+ if (sup.isDefinedAt(notification)) notifySupervisorWithMessage(notification)
else Actor.log.warning(
"No message handler defined for system message [MaximumNumberOfRestartsWithinTimeRangeReached]" +
"\n\tCan't send the message to the supervisor [%s].", sup)
@@ -1012,7 +1012,7 @@ sealed class LocalActorRef private[akka](
guard.withGuard {
lifeCycle match {
case Some(LifeCycle(Temporary, _, _)) => shutDownTemporaryActor(this)
- case _ =>
+ case _ =>
// either permanent or none where default is permanent
Actor.log.info("Restarting actor [%s] configured as PERMANENT.", id)
Actor.log.debug("Restarting linked actors for actor [%s].", id)
@@ -1062,7 +1062,7 @@ sealed class LocalActorRef private[akka](
failedActor.preRestart(reason)
failedActor.postRestart(reason)
}
-
+
private def restartActor(failedActor: Actor, reason: Throwable) = {
failedActor.preRestart(reason)
nullOutActorRefReferencesFor(failedActor)
@@ -1073,7 +1073,7 @@ sealed class LocalActorRef private[akka](
Actor.log.debug("Invoking 'postRestart' for new actor instance [%s].", id)
freshActor.postRestart(reason)
}
-
+
private def spawnButDoNotStart[T <: Actor: Manifest]: ActorRef = guard.withGuard {
val actorRef = Actor.actorOf(manifest[T].erasure.asInstanceOf[Class[T]].newInstance)
if (!dispatcher.isInstanceOf[ThreadBasedDispatcher]) actorRef.dispatcher = dispatcher
@@ -1113,8 +1113,8 @@ sealed class LocalActorRef private[akka](
clearTransactionSet
createNewTransactionSet
} else oldTxSet
- Actor.log.ifTrace("Joining transaction set [" + currentTxSet +
- "];\n\tactor " + toString +
+ Actor.log.ifTrace("Joining transaction set [" + currentTxSet +
+ "];\n\tactor " + toString +
"\n\twith message [" + message + "]")
val mtx = ThreadLocalTransaction.getThreadLocalTransaction
if ((mtx eq null) || mtx.getStatus.isDead) currentTxSet.incParties
@@ -1130,7 +1130,7 @@ sealed class LocalActorRef private[akka](
else {
topLevelTransaction = true // FIXME create a new internal atomic block that can wait for X seconds if top level tx
if (isTransactor) {
- Actor.log.ifTrace("Creating a new transaction set (top-level transaction)\n\tfor actor " + toString +
+ Actor.log.ifTrace("Creating a new transaction set (top-level transaction)\n\tfor actor " + toString +
"\n\twith message " + messageHandle)
Some(createNewTransactionSet)
} else None
@@ -1152,7 +1152,7 @@ sealed class LocalActorRef private[akka](
} catch {
case e: DeadTransactionException =>
handleExceptionInDispatch(
- new TransactionSetAbortedException("Transaction set has been aborted by another participant"),
+ new TransactionSetAbortedException("Transaction set has been aborted by another participant"),
message, topLevelTransaction)
case e: InterruptedException => {} // received message while actor is shutting down, ignore
case e => handleExceptionInDispatch(e, message, topLevelTransaction)
@@ -1199,14 +1199,14 @@ sealed class LocalActorRef private[akka](
private def notifySupervisorWithMessage(notification: LifeCycleMessage) = {
// FIXME to fix supervisor restart of remote actor for oneway calls, inject a supervisor proxy that can send notification back to client
- _supervisor.foreach { sup =>
+ _supervisor.foreach { sup =>
if (sup.isShutdown) { // if supervisor is shut down, game over for all linked actors
// shutdownLinkedActors
// stop
} else sup ! notification // else notify supervisor
}
}
-
+
private def nullOutActorRefReferencesFor(actor: Actor) = {
actorSelfFields._1.set(actor, null)
actorSelfFields._2.set(actor, null)
diff --git a/akka-core/src/main/scala/actor/ActorRegistry.scala b/akka-core/src/main/scala/actor/ActorRegistry.scala
index 57b27f08b0..cebc2ec287 100644
--- a/akka-core/src/main/scala/actor/ActorRegistry.scala
+++ b/akka-core/src/main/scala/actor/ActorRegistry.scala
@@ -29,11 +29,11 @@ case class ActorUnregistered(actor: ActorRef) extends ActorRegistryEvent
* @author Jonas Bonér
*/
object ActorRegistry extends ListenerManagement {
-
+
private val refComparator = new java.util.Comparator[ActorRef]{
def compare(a: ActorRef,b: ActorRef) = a.uuid.compareTo(b.uuid)
}
-
+
private val actorsByUUID = new ConcurrentHashMap[String, ActorRef]
private val actorsById = new ConcurrentHashMap[String, JSet[ActorRef]]
private val actorsByClassName = new ConcurrentHashMap[String, JSet[ActorRef]]
diff --git a/akka-core/src/main/scala/actor/SerializationProtocol.scala b/akka-core/src/main/scala/actor/SerializationProtocol.scala
index 3897d3abda..b1cbb53bdc 100644
--- a/akka-core/src/main/scala/actor/SerializationProtocol.scala
+++ b/akka-core/src/main/scala/actor/SerializationProtocol.scala
@@ -226,7 +226,7 @@ object RemoteActorSerialization {
.build
}
- def createRemoteRequestProtocolBuilder(actorRef: ActorRef, message: Any, isOneWay: Boolean, senderOption: Option[ActorRef]):
+ def createRemoteRequestProtocolBuilder(actorRef: ActorRef, message: Any, isOneWay: Boolean, senderOption: Option[ActorRef]):
RemoteRequestProtocol.Builder = {
import actorRef._
diff --git a/akka-core/src/main/scala/actor/Supervisor.scala b/akka-core/src/main/scala/actor/Supervisor.scala
index ede7d380db..9b56bddf38 100644
--- a/akka-core/src/main/scala/actor/Supervisor.scala
+++ b/akka-core/src/main/scala/actor/Supervisor.scala
@@ -180,7 +180,7 @@ final class SupervisorActor private[akka] (
handler: FaultHandlingStrategy,
trapExceptions: List[Class[_ <: Throwable]]) extends Actor {
import self._
-
+
trapExit = trapExceptions
faultHandler = Some(handler)
diff --git a/akka-core/src/main/scala/actor/TypedActor.scala b/akka-core/src/main/scala/actor/TypedActor.scala
index f624daeb33..7526d48b05 100644
--- a/akka-core/src/main/scala/actor/TypedActor.scala
+++ b/akka-core/src/main/scala/actor/TypedActor.scala
@@ -22,7 +22,7 @@ import java.net.InetSocketAddress
import java.lang.reflect.{InvocationTargetException, Method, Field}
import scala.reflect.BeanProperty
-
+
/**
* FIXME: document TypedActor
*
@@ -33,12 +33,12 @@ import scala.reflect.BeanProperty
* Pong pong = (Pong) getContext().getSender();
* pong.hit(count++);
* }
- *
+ *
* @Override
* public void init() {
* ... // optional initialization on start
* }
- *
+ *
* @Override
* public void shutdown() {
* ... // optional cleanup on stop
@@ -46,7 +46,7 @@ import scala.reflect.BeanProperty
*
* ... // more life-cycle callbacks if needed
* }
- *
+ *
* // create the ping actor
* Ping ping = TypedActor.newInstance(Ping.class, PingImpl.class);
*
@@ -56,7 +56,7 @@ import scala.reflect.BeanProperty
* // stop the actor
* TypedActor.stop(ping);
*
- *
+ *
* Here is an example of usage (in Scala):
*
* class PingImpl extends TypedActor with Ping {
@@ -68,14 +68,14 @@ import scala.reflect.BeanProperty
* override def init = {
* ... // optional initialization on start
* }
- *
+ *
* override def shutdown = {
* ... // optional cleanup on stop
* }
*
* ... // more life-cycle callbacks if needed
* }
- *
+ *
* // create the ping actor
* val ping = TypedActor.newInstance(classOf[Ping], classOf[PingImpl])
*
@@ -85,7 +85,7 @@ import scala.reflect.BeanProperty
* // stop the actor
* TypedActor.stop(ping)
*
- *
+ *
* @author Jonas Bonér
*/
abstract class TypedActor extends Logging {
@@ -97,7 +97,7 @@ abstract class TypedActor extends Logging {
* This class does not contain static information but is updated by the runtime system
* at runtime.
*
- * You can get a hold of the context using either the 'getContext()' or 'context'
+ * You can get a hold of the context using either the 'getContext()' or 'context'
* methods from the 'TypedActor' base class.
*
*
@@ -110,7 +110,7 @@ abstract class TypedActor extends Logging {
* }
* }
*
- *
+ *
* Here is an example of usage (in Scala):
*
* class PingImpl extends TypedActor with Ping {
@@ -127,7 +127,7 @@ abstract class TypedActor extends Logging {
* The uuid for the Typed Actor.
*/
@BeanProperty @volatile var uuid = UUID.newUuid.toString
-
+
/**
* Identifier for actor, does not have to be a unique one. Default is the 'uuid'.
*
@@ -189,14 +189,14 @@ abstract class TypedActor extends Logging {
*
* @author Jonas Bonér
*/
-@transactionrequired
+@transactionrequired
abstract class TypedTransactor extends TypedActor
/**
* Configuration factory for TypedActors.
*
* FIXDOC: document TypedActorConfiguration
- *
+ *
* @author Jonas Bonér
*/
final class TypedActorConfiguration {
@@ -246,7 +246,7 @@ final class TypedActorConfiguration {
* This class does not contain static information but is updated by the runtime system
* at runtime.
*
- * You can get a hold of the context using either the 'getContext()' or 'context'
+ * You can get a hold of the context using either the 'getContext()' or 'context'
* methods from the 'TypedActor' base class.
*
* Here is an example of usage (from Java):
@@ -258,7 +258,7 @@ final class TypedActorConfiguration {
* }
* }
*
- *
+ *
* Here is an example of usage (in Scala):
*
* class PingImpl extends TypedActor with Ping {
@@ -320,19 +320,19 @@ object TypedActor extends Logging {
private[actor] val AW_PROXY_PREFIX = "$$ProxiedByAW".intern
def newInstance[T](intfClass: Class[T], targetClass: Class[_], timeout: Long): T = {
- newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), None, timeout)
+ newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), None, timeout)
}
def newInstance[T](intfClass: Class[T], targetClass: Class[_]): T = {
- newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), None, Actor.TIMEOUT)
+ newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), None, Actor.TIMEOUT)
}
def newRemoteInstance[T](intfClass: Class[T], targetClass: Class[_], timeout: Long, hostname: String, port: Int): T = {
- newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), Some(new InetSocketAddress(hostname, port)), timeout)
+ newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), Some(new InetSocketAddress(hostname, port)), timeout)
}
def newRemoteInstance[T](intfClass: Class[T], targetClass: Class[_], hostname: String, port: Int): T = {
- newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), Some(new InetSocketAddress(hostname, port)), Actor.TIMEOUT)
+ newInstance(intfClass, newTypedActor(targetClass), actorOf(new Dispatcher(false)), Some(new InetSocketAddress(hostname, port)), Actor.TIMEOUT)
}
def newInstance[T](intfClass: Class[T], targetClass: Class[_], config: TypedActorConfiguration): T = {
@@ -356,7 +356,7 @@ object TypedActor extends Logging {
// NOTE: currently not used - but keep it around
private[akka] def newInstance[T <: TypedActor](
targetClass: Class[T], actorRef: ActorRef, remoteAddress: Option[InetSocketAddress], timeout: Long): T = {
- val proxy = {
+ val proxy = {
val instance = Proxy.newInstance(targetClass, true, false)
if (instance.isInstanceOf[TypedActor]) instance.asInstanceOf[TypedActor]
else throw new IllegalActorStateException("Actor [" + targetClass.getName + "] is not a sub class of 'TypedActor'")
@@ -378,7 +378,7 @@ object TypedActor extends Logging {
/**
* Get the underlying dispatcher actor for the given Typed Actor.
*/
- def actorFor(proxy: AnyRef): Option[ActorRef] =
+ def actorFor(proxy: AnyRef): Option[ActorRef] =
ActorRegistry
.actorsFor(classOf[Dispatcher])
.find(a => a.actor.asInstanceOf[Dispatcher].proxy == proxy)
@@ -403,7 +403,7 @@ object TypedActor extends Logging {
* @param handler fault handling strategy
* @param trapExceptions array of exceptions that should be handled by the supervisor
*/
- def link(supervisor: AnyRef, supervised: AnyRef,
+ def link(supervisor: AnyRef, supervised: AnyRef,
handler: FaultHandlingStrategy, trapExceptions: Array[Class[_ <: Throwable]]) = {
val supervisorActor = actorFor(supervisor).getOrElse(
throw new IllegalActorStateException("Can't link when the supervisor is not an Typed Actor"))
@@ -463,8 +463,8 @@ object TypedActor extends Logging {
val parent = clazz.getSuperclass
if (parent != null) injectTypedActorContext0(activeObject, parent)
else {
- log.ifTrace("Can't set 'TypedActorContext' for TypedActor [" +
- activeObject.getClass.getName +
+ log.ifTrace("Can't set 'TypedActorContext' for TypedActor [" +
+ activeObject.getClass.getName +
"] since no field of this type could be found.")
None
}
@@ -475,7 +475,7 @@ object TypedActor extends Logging {
private[akka] def newTypedActor(targetClass: Class[_]): TypedActor = {
val instance = targetClass.newInstance
- val typedActor =
+ val typedActor =
if (instance.isInstanceOf[TypedActor]) instance.asInstanceOf[TypedActor]
else throw new IllegalArgumentException("Actor [" + targetClass.getName + "] is not a sub class of 'TypedActor'")
typedActor.init
@@ -546,14 +546,14 @@ private[akka] sealed case class AspectInit(
val actorRef: ActorRef,
val remoteAddress: Option[InetSocketAddress],
val timeout: Long) {
- def this(interfaceClass: Class[_], targetInstance: TypedActor, actorRef: ActorRef, timeout: Long) =
+ def this(interfaceClass: Class[_], targetInstance: TypedActor, actorRef: ActorRef, timeout: Long) =
this(interfaceClass, targetInstance, actorRef, None, timeout)
}
/**
* AspectWerkz Aspect that is turning POJO into TypedActor.
*
- * Is deployed on a 'perInstance' basis with the pointcut 'execution(* *.*(..))',
+ * Is deployed on a 'perInstance' basis with the pointcut 'execution(* *.*(..))',
* e.g. all methods on the instance.
*
* @author Jonas Bonér
@@ -620,7 +620,7 @@ private[akka] sealed class TypedActorAspect {
.setInterface(interfaceClass.getName)
.setMethod(rtti.getMethod.getName)
.build
-
+
val actorInfo = ActorInfoProtocol.newBuilder
.setUuid(uuid)
.setTarget(targetInstance.getClass.getName)
@@ -736,7 +736,7 @@ private[akka] class Dispatcher(transactionalRequired: Boolean) extends Actor {
private[actor] def initialize(
targetClass: Class[_], targetInstance: TypedActor, proxy: AnyRef, ctx: Option[TypedActorContext]) = {
if (transactionalRequired || isTransactional(targetClass)) self.makeTransactionRequired
-
+
self.id = targetClass.getName
this.targetClass = targetClass
this.proxy = proxy
@@ -804,11 +804,11 @@ private[akka] class Dispatcher(transactionalRequired: Boolean) extends Actor {
targetInstance.initTransactionalState
}
- def isTransactional(clazz: Class[_]): Boolean =
+ def isTransactional(clazz: Class[_]): Boolean =
if (clazz == null) false
else if (clazz.isAnnotationPresent(Annotations.transactionrequired)) true
else isTransactional(clazz.getSuperclass)
-
+
private def serializeArguments(joinPoint: JoinPoint) = {
val args = joinPoint.getRtti.asInstanceOf[MethodRtti].getParameterValues
var unserializable = false
diff --git a/akka-core/src/main/scala/actor/UntypedActor.scala b/akka-core/src/main/scala/actor/UntypedActor.scala
index 81924886d9..61e310d732 100644
--- a/akka-core/src/main/scala/actor/UntypedActor.scala
+++ b/akka-core/src/main/scala/actor/UntypedActor.scala
@@ -5,7 +5,7 @@
package se.scalablesolutions.akka.actor
/**
- * FIXME: document
+ * FIXME: document
*
* @author Jonas Bonér
*/
@@ -13,7 +13,7 @@ abstract class UntypedActor extends Actor {
protected[akka] var context: Option[ActorContext] = None
protected def receive = {
- case msg =>
+ case msg =>
if (context.isEmpty) {
val ctx = new ActorContext(self)
context = Some(ctx)
@@ -25,9 +25,9 @@ abstract class UntypedActor extends Actor {
}
/**
- * FIXME: document
+ * FIXME: document
*
* @author Jonas Bonér
*/
class ActorContext(val self: ActorRef) {
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/main/scala/config/TypedActorConfigurator.scala b/akka-core/src/main/scala/config/TypedActorConfigurator.scala
index 797d52cd70..d639d21f5f 100644
--- a/akka-core/src/main/scala/config/TypedActorConfigurator.scala
+++ b/akka-core/src/main/scala/config/TypedActorConfigurator.scala
@@ -32,7 +32,7 @@ class TypedActorConfigurator {
* @param clazz the class for the typed actor
* @return a list with all the typed actors for the class
*/
- def getInstances[T](clazz: Class[T]): JList[T] =
+ def getInstances[T](clazz: Class[T]): JList[T] =
INSTANCE.getInstance(clazz).foldLeft(new ArrayList[T]){ (l, i) => l add i ; l }
/**
diff --git a/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala b/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala
index 29efc14082..fe9289f1f8 100644
--- a/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala
+++ b/akka-core/src/main/scala/config/TypedActorGuiceConfigurator.scala
@@ -81,7 +81,7 @@ private[akka] class TypedActorGuiceConfigurator extends TypedActorConfiguratorBa
}
private def newSubclassingProxy(component: Component): DependencyBinding = {
- val targetClass =
+ val targetClass =
if (component.target.isInstanceOf[Class[_ <: TypedActor]]) component.target.asInstanceOf[Class[_ <: TypedActor]]
else throw new IllegalArgumentException("TypedActor [" + component.target.getName + "] must be a subclass of TypedActor")
val actorRef = Actor.actorOf(new Dispatcher(component.transactionRequired))
@@ -103,7 +103,7 @@ private[akka] class TypedActorGuiceConfigurator extends TypedActorConfiguratorBa
val targetClass = component.intf.get
val instance = component.target.newInstance.asInstanceOf[AnyRef] // TODO: perhaps need to put in registry
- val targetInstance =
+ val targetInstance =
if (instance.isInstanceOf[TypedActor]) instance.asInstanceOf[TypedActor]
else throw new IllegalArgumentException("TypedActor [" + component.target.getName + "] must be a subclass of TypedActor")
diff --git a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
index 42d1ae1620..836dc0ea86 100644
--- a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenDispatcher.scala
@@ -153,7 +153,7 @@ class ExecutorBasedEventDrivenDispatcher(_name: String, throughput: Int = Dispat
def ensureNotActive(): Unit = if (active) throw new IllegalActorStateException(
"Can't build a new thread pool for a dispatcher that is already up and running")
-
+
override def toString = "ExecutorBasedEventDrivenDispatcher[" + name + "]"
// FIXME: should we have an unbounded queue and not bounded as default ????
diff --git a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
index 6f4ec934eb..b9ff5d92f4 100644
--- a/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcher.scala
@@ -52,7 +52,7 @@ class ExecutorBasedEventDrivenWorkStealingDispatcher(_name: String) extends Mess
private def getMailbox(receiver: ActorRef) = receiver.mailbox.asInstanceOf[ConcurrentLinkedDeque[MessageInvocation]]
override def mailboxSize(actorRef: ActorRef) = getMailbox(actorRef).size
-
+
def dispatch(invocation: MessageInvocation) = if (active) {
getMailbox(invocation.receiver).add(invocation)
executor.execute(new Runnable() {
@@ -175,7 +175,7 @@ class ExecutorBasedEventDrivenWorkStealingDispatcher(_name: String) extends Mess
"Can't build a new thread pool for a dispatcher that is already up and running")
override def toString = "ExecutorBasedEventDrivenWorkStealingDispatcher[" + name + "]"
-
+
private[akka] def init = withNewThreadPoolWithLinkedBlockingQueueWithUnboundedCapacity.buildThreadPool
override def register(actorRef: ActorRef) = {
diff --git a/akka-core/src/main/scala/dispatch/HawtDispatcher.scala b/akka-core/src/main/scala/dispatch/HawtDispatcher.scala
index 3e14f0a5aa..45e4468b3d 100644
--- a/akka-core/src/main/scala/dispatch/HawtDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/HawtDispatcher.scala
@@ -69,7 +69,7 @@ object HawtDispatcher {
*/
def queue(actorRef: ActorRef) = {
mailbox(actorRef).queue
- }
+ }
/**
@@ -173,7 +173,7 @@ object HawtDispatcher {
class HawtDispatcher(val aggregate:Boolean=true, val parent:DispatchQueue=globalQueue) extends MessageDispatcher {
import HawtDispatcher._
private val active = new AtomicBoolean(false)
-
+
def start = {
if( active.compareAndSet(false, true) ) {
retainNonDaemon
diff --git a/akka-core/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala b/akka-core/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala
index e6896ef706..d0850aa830 100644
--- a/akka-core/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala
+++ b/akka-core/src/main/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcher.scala
@@ -14,7 +14,7 @@ import java.util.{LinkedList, List}
class ReactorBasedSingleThreadEventDrivenDispatcher(_name: String)
extends AbstractReactorBasedEventDrivenDispatcher("akka:event-driven:reactor:single-thread:dispatcher:" + _name) {
-
+
def start = if (!active) {
log.debug("Starting up %s", toString)
active = true
diff --git a/akka-core/src/main/scala/remote/RemoteServer.scala b/akka-core/src/main/scala/remote/RemoteServer.scala
index e93fc4db48..55a74feab0 100644
--- a/akka-core/src/main/scala/remote/RemoteServer.scala
+++ b/akka-core/src/main/scala/remote/RemoteServer.scala
@@ -432,9 +432,9 @@ class RemoteServerHandler(
/**
* Creates a new instance of the actor with name, uuid and timeout specified as arguments.
- *
+ *
* If actor already created then just return it from the registry.
- *
+ *
* Does not start the actor.
*/
private def createActor(actorInfo: ActorInfoProtocol): ActorRef = {
@@ -474,11 +474,11 @@ class RemoteServerHandler(
try {
log.info("Creating a new remote typed actor:\n\t[%s :: %s]", interfaceClassname, targetClassname)
- val (interfaceClass, targetClass) =
- if (applicationLoader.isDefined) (applicationLoader.get.loadClass(interfaceClassname),
+ val (interfaceClass, targetClass) =
+ if (applicationLoader.isDefined) (applicationLoader.get.loadClass(interfaceClassname),
applicationLoader.get.loadClass(targetClassname))
else (Class.forName(interfaceClassname), Class.forName(targetClassname))
-
+
val newInstance = TypedActor.newInstance(
interfaceClass, targetClass.asInstanceOf[Class[_ <: TypedActor]], actorInfo.getTimeout).asInstanceOf[AnyRef]
activeObjects.put(uuid, newInstance)
@@ -488,7 +488,7 @@ class RemoteServerHandler(
}
} else activeObjectOrNull
}
-
+
private def createErrorReplyMessage(e: Throwable, request: RemoteRequestProtocol, isActor: Boolean): RemoteReplyProtocol = {
val actorInfo = request.getActorInfo
log.error(e, "Could not invoke remote typed actor [%s :: %s]", actorInfo.getTypedActorInfo.getMethod, actorInfo.getTarget)
diff --git a/akka-core/src/main/scala/stm/JTA.scala b/akka-core/src/main/scala/stm/JTA.scala
index 24b5a49086..1c0af88d73 100644
--- a/akka-core/src/main/scala/stm/JTA.scala
+++ b/akka-core/src/main/scala/stm/JTA.scala
@@ -4,8 +4,8 @@
package se.scalablesolutions.akka.stm
-import javax.transaction.{TransactionManager, UserTransaction,
- Transaction => JtaTransaction, SystemException,
+import javax.transaction.{TransactionManager, UserTransaction,
+ Transaction => JtaTransaction, SystemException,
Status, Synchronization, TransactionSynchronizationRegistry}
import javax.naming.{InitialContext, Context, NamingException}
diff --git a/akka-core/src/main/scala/stm/TransactionFactory.scala b/akka-core/src/main/scala/stm/TransactionFactory.scala
index 329928c011..691fec675b 100644
--- a/akka-core/src/main/scala/stm/TransactionFactory.scala
+++ b/akka-core/src/main/scala/stm/TransactionFactory.scala
@@ -153,7 +153,7 @@ object TransactionFactory {
* @see TransactionConfig for configuration options.
*/
class TransactionFactory(
- val config: TransactionConfig = DefaultTransactionConfig,
+ val config: TransactionConfig = DefaultTransactionConfig,
defaultName: String = TransactionConfig.FAMILY_NAME) { self =>
// use the config family name if it's been set, otherwise defaultName - used by actors to set class name as default
diff --git a/akka-core/src/main/scala/stm/TransactionManagement.scala b/akka-core/src/main/scala/stm/TransactionManagement.scala
index 25e58f3fb6..65f8d7624c 100644
--- a/akka-core/src/main/scala/stm/TransactionManagement.scala
+++ b/akka-core/src/main/scala/stm/TransactionManagement.scala
@@ -160,7 +160,7 @@ class GlobalStm extends TransactionManagement with Logging {
txSet.tryJoinCommit(
mtx,
TransactionConfig.DefaultTimeout.length,
- TransactionConfig.DefaultTimeout.unit)
+ TransactionConfig.DefaultTimeout.unit)
// Need to catch IllegalStateException until we have fix in Multiverse, since it throws it by mistake
} catch { case e: IllegalStateException => {} }
result
@@ -170,19 +170,19 @@ class GlobalStm extends TransactionManagement with Logging {
}
trait StmUtil {
-
+
/**
* Schedule a deferred task on the thread local transaction (use within an atomic).
* This is executed when the transaction commits.
*/
- def deferred[T](body: => T): Unit =
+ def deferred[T](body: => T): Unit =
MultiverseStmUtils.scheduleDeferredTask(new Runnable { def run = body })
/**
* Schedule a compensating task on the thread local transaction (use within an atomic).
* This is executed when the transaction aborts.
*/
- def compensating[T](body: => T): Unit =
+ def compensating[T](body: => T): Unit =
MultiverseStmUtils.scheduleCompensatingTask(new Runnable { def run = body })
/**
@@ -193,7 +193,7 @@ trait StmUtil {
/**
* Use either-orElse to combine two blocking transactions.
- * Usage:
+ * Usage:
*
* either {
* ...
diff --git a/akka-core/src/test/scala/actor/NestedTransactionalTypedActorSpec.scala b/akka-core/src/test/scala/actor/NestedTransactionalTypedActorSpec.scala
index e0c59800bc..7338e8df41 100644
--- a/akka-core/src/test/scala/actor/NestedTransactionalTypedActorSpec.scala
+++ b/akka-core/src/test/scala/actor/NestedTransactionalTypedActorSpec.scala
@@ -99,4 +99,4 @@ class NestedTransactionalTypedActorSpec extends
nested.getRefState should equal("init")
}
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala b/akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala
index 248cbcbcab..ff43467efc 100644
--- a/akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala
+++ b/akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala
@@ -74,4 +74,4 @@ class ReceiveTimeoutSpec extends JUnitSuite {
assert(timeoutLatch.tryAwait(1, TimeUnit.SECONDS) == false)
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/test/scala/actor/RestartNestedTransactionalTypedActorSpec.scala b/akka-core/src/test/scala/actor/RestartNestedTransactionalTypedActorSpec.scala
index d853230371..e70370c261 100644
--- a/akka-core/src/test/scala/actor/RestartNestedTransactionalTypedActorSpec.scala
+++ b/akka-core/src/test/scala/actor/RestartNestedTransactionalTypedActorSpec.scala
@@ -58,19 +58,19 @@ class RestartNestedTransactionalTypedActorSpec extends
val stateful = conf.getInstance(classOf[TransactionalTypedActor])
stateful.init
stateful.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init") // set init state
-
+
val nested = conf.getInstance(classOf[NestedTransactionalTypedActor])
nested.init
nested.setMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure", "init") // set init state
-
+
val failer = conf.getInstance(classOf[TypedActorFailer])
try {
stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
-
+
fail("should have thrown an exception")
} catch { case e => {} }
stateful.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
-
+
nested.getMapState("testShouldRollbackStateForStatefulServerInCaseOfFailure") should equal("init")
}
@@ -78,19 +78,19 @@ class RestartNestedTransactionalTypedActorSpec extends
val stateful = conf.getInstance(classOf[TransactionalTypedActor])
stateful.init
stateful.setVectorState("init") // set init state
-
+
val nested = conf.getInstance(classOf[NestedTransactionalTypedActor])
nested.init
nested.setVectorState("init") // set init state
-
+
val failer = conf.getInstance(classOf[TypedActorFailer])
try {
stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
-
+
fail("should have thrown an exception")
} catch { case e => {} }
stateful.getVectorState should equal("init")
-
+
nested.getVectorState should equal("init")
}
@@ -100,19 +100,19 @@ class RestartNestedTransactionalTypedActorSpec extends
val nested = conf.getInstance(classOf[NestedTransactionalTypedActor])
nested.init
stateful.setRefState("init") // set init state
-
+
nested.setRefState("init") // set init state
-
+
val failer = conf.getInstance(classOf[TypedActorFailer])
try {
stateful.failure("testShouldRollbackStateForStatefulServerInCaseOfFailure", "new state", nested, failer)
-
+
fail("should have thrown an exception")
} catch { case e => {} }
stateful.getRefState should equal("init")
-
+
nested.getRefState should equal("init")
}
*/
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/test/scala/actor/RestartTransactionalTypedActorSpec.scala b/akka-core/src/test/scala/actor/RestartTransactionalTypedActorSpec.scala
index a4f9c61f59..5da6f9594f 100644
--- a/akka-core/src/test/scala/actor/RestartTransactionalTypedActorSpec.scala
+++ b/akka-core/src/test/scala/actor/RestartTransactionalTypedActorSpec.scala
@@ -46,7 +46,7 @@ class RestartTransactionalTypedActorSpec extends
conf.stop
ActorRegistry.shutdownAll
}
-
+
describe("Restart supervised transactional Active Object ") {
/*
it("map should rollback state for stateful server in case of failure") {
diff --git a/akka-core/src/test/scala/actor/SchedulerSpec.scala b/akka-core/src/test/scala/actor/SchedulerSpec.scala
index 450a265788..1cedb27354 100644
--- a/akka-core/src/test/scala/actor/SchedulerSpec.scala
+++ b/akka-core/src/test/scala/actor/SchedulerSpec.scala
@@ -83,4 +83,4 @@ class SchedulerSpec extends JUnitSuite {
// should be enough time for the ping countdown to recover and reach 6 pings
assert(pingLatch.await(4, TimeUnit.SECONDS))
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/test/scala/actor/SupervisorHierarchySpec.scala b/akka-core/src/test/scala/actor/SupervisorHierarchySpec.scala
index 138313bafc..ffc9dbd860 100644
--- a/akka-core/src/test/scala/actor/SupervisorHierarchySpec.scala
+++ b/akka-core/src/test/scala/actor/SupervisorHierarchySpec.scala
@@ -14,7 +14,7 @@ import java.util.concurrent.{TimeUnit, CountDownLatch}
object SupervisorHierarchySpec {
class FireWorkerException(msg: String) extends Exception(msg)
-
+
class CountDownActor(countDown: CountDownLatch) extends Actor {
protected def receive = { case _ => () }
override def postRestart(reason: Throwable) = countDown.countDown
@@ -57,7 +57,7 @@ class SupervisorHierarchySpec extends JUnitSuite {
assert(countDown.await(2, TimeUnit.SECONDS))
}
-
+
@Test
def supervisorShouldReceiveNotificationMessageWhenMaximumNumberOfRestartsWithinTimeRangeIsReached = {
val countDown = new CountDownLatch(2)
@@ -65,7 +65,7 @@ class SupervisorHierarchySpec extends JUnitSuite {
val boss = actorOf(new Actor{
self.trapExit = List(classOf[Throwable])
self.faultHandler = Some(OneForOneStrategy(1, 5000))
- protected def receive = {
+ protected def receive = {
case MaximumNumberOfRestartsWithinTimeRangeReached(_, _, _, _) =>
countDown.countDown
}
@@ -75,7 +75,7 @@ class SupervisorHierarchySpec extends JUnitSuite {
crasher ! Exit(crasher, new FireWorkerException("Fire the worker!"))
crasher ! Exit(crasher, new FireWorkerException("Fire the worker!"))
- assert(countDown.await(2, TimeUnit.SECONDS))
+ assert(countDown.await(2, TimeUnit.SECONDS))
}
}
diff --git a/akka-core/src/test/scala/actor/TransactionalTypedActorSpec.scala b/akka-core/src/test/scala/actor/TransactionalTypedActorSpec.scala
index e8ac4c3fd7..c07c53935e 100644
--- a/akka-core/src/test/scala/actor/TransactionalTypedActorSpec.scala
+++ b/akka-core/src/test/scala/actor/TransactionalTypedActorSpec.scala
@@ -24,7 +24,7 @@ class TransactionalTypedActorSpec extends
override def afterAll {
// ActorRegistry.shutdownAll
}
-
+
describe("Declaratively supervised transactional in-memory Active Object ") {
it("map should not rollback state for stateful server in case of success") {
val stateful = TypedActor.newInstance(classOf[TransactionalTypedActor], classOf[TransactionalTypedActorImpl])
diff --git a/akka-core/src/test/scala/actor/TypedActorContextSpec.scala b/akka-core/src/test/scala/actor/TypedActorContextSpec.scala
index 5c3fb629ad..11719650d6 100644
--- a/akka-core/src/test/scala/actor/TypedActorContextSpec.scala
+++ b/akka-core/src/test/scala/actor/TypedActorContextSpec.scala
@@ -24,7 +24,7 @@ class TypedActorContextSpec extends
val pojo = TypedActor.newInstance(classOf[SimpleJavaPojo], classOf[SimpleJavaPojoImpl])
val pojoCaller = TypedActor.newInstance(classOf[SimpleJavaPojoCaller], classOf[SimpleJavaPojoCallerImpl])
pojoCaller.setPojo(pojo)
- try {
+ try {
pojoCaller.getSenderFromSimpleJavaPojo should equal (pojoCaller)
} catch {
case e => fail("no sender available")
@@ -35,7 +35,7 @@ class TypedActorContextSpec extends
val pojo = TypedActor.newInstance(classOf[SimpleJavaPojo], classOf[SimpleJavaPojoImpl])
val pojoCaller = TypedActor.newInstance(classOf[SimpleJavaPojoCaller], classOf[SimpleJavaPojoCallerImpl])
pojoCaller.setPojo(pojo)
- try {
+ try {
pojoCaller.getSenderFutureFromSimpleJavaPojo.getClass.getName should equal (classOf[DefaultCompletableFuture[_]].getName)
} catch {
case e => fail("no sender future available", e)
diff --git a/akka-core/src/test/scala/actor/TypedActorLifecycleSpec.scala b/akka-core/src/test/scala/actor/TypedActorLifecycleSpec.scala
index 02a5712410..2db8820f9c 100644
--- a/akka-core/src/test/scala/actor/TypedActorLifecycleSpec.scala
+++ b/akka-core/src/test/scala/actor/TypedActorLifecycleSpec.scala
@@ -166,4 +166,4 @@ class TypedActorLifecycleSpec extends Spec with ShouldMatchers with BeforeAndAft
}
*/
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/test/scala/routing/RoutingSpec.scala b/akka-core/src/test/scala/routing/RoutingSpec.scala
index b709714de9..747363efe6 100644
--- a/akka-core/src/test/scala/routing/RoutingSpec.scala
+++ b/akka-core/src/test/scala/routing/RoutingSpec.scala
@@ -172,4 +172,4 @@ class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers
for(a <- List(t1,t2,d1,d2)) a.stop
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala b/akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
index 7777fa6580..a9bcc35790 100644
--- a/akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
+++ b/akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala
@@ -174,7 +174,7 @@ class MyStatelessActorWithMessagesInMailbox extends Actor {
@serializable class MyJavaSerializableActor extends Actor {
var count = 0
self.receiveTimeout = Some(1000)
-
+
def receive = {
case "hello" =>
count = count + 1
diff --git a/akka-core/src/test/scala/stm/RefSpec.scala b/akka-core/src/test/scala/stm/RefSpec.scala
index 33ce43ab10..6e972152e5 100644
--- a/akka-core/src/test/scala/stm/RefSpec.scala
+++ b/akka-core/src/test/scala/stm/RefSpec.scala
@@ -153,4 +153,4 @@ class RefSpec extends Spec with ShouldMatchers {
optGreater2 should be(None)
}
}
-}
\ No newline at end of file
+}
diff --git a/akka-core/src/test/scala/tickets/Proof001Spec.scala b/akka-core/src/test/scala/tickets/Proof001Spec.scala
index 29e4ca3137..5e179ec16d 100644
--- a/akka-core/src/test/scala/tickets/Proof001Spec.scala
+++ b/akka-core/src/test/scala/tickets/Proof001Spec.scala
@@ -7,4 +7,4 @@ import org.junit.Test
class Proof001Spec extends JUnitSuite {
@Test def thisFixesSomeSpecifiedBug = ()
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-camel/src/main/scala/Actors.scala b/akka-samples/akka-sample-camel/src/main/scala/Actors.scala
index f3b50d9c6e..64bdb19dfd 100644
--- a/akka-samples/akka-sample-camel/src/main/scala/Actors.scala
+++ b/akka-samples/akka-sample-camel/src/main/scala/Actors.scala
@@ -115,7 +115,7 @@ class PublisherBridge(uri: String, publisher: ActorRef) extends Actor with Consu
class HttpConsumer(producer: ActorRef) extends Actor with Consumer {
def endpointUri = "jetty:http://0.0.0.0:8875/"
-
+
protected def receive = {
case msg => producer forward msg
}
diff --git a/akka-samples/akka-sample-camel/src/test/scala/HttpConcurrencyTest.scala b/akka-samples/akka-sample-camel/src/test/scala/HttpConcurrencyTest.scala
index 71c5d02ce4..b98876a01d 100644
--- a/akka-samples/akka-sample-camel/src/test/scala/HttpConcurrencyTest.scala
+++ b/akka-samples/akka-sample-camel/src/test/scala/HttpConcurrencyTest.scala
@@ -98,4 +98,4 @@ object HttpConcurrencyTest {
case msg => self.reply(msg)
}
}
-}
\ No newline at end of file
+}
diff --git a/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala b/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
index 4d20b60448..b361fbb16b 100644
--- a/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
+++ b/akka-samples/akka-sample-lift/src/main/scala/akka/SimpleService.scala
@@ -91,4 +91,4 @@ object SimpleRestService extends RestHelper {
//Return either the resulting NodeSeq or a default one
(result getOrElse Error in counter
).asInstanceOf[Node]
}
- }
\ No newline at end of file
+ }
diff --git a/akka-samples/akka-sample-osgi/src/main/scala/osgiExample.scala b/akka-samples/akka-sample-osgi/src/main/scala/osgiExample.scala
index 3c233fdf1f..18323d04d3 100644
--- a/akka-samples/akka-sample-osgi/src/main/scala/osgiExample.scala
+++ b/akka-samples/akka-sample-osgi/src/main/scala/osgiExample.scala
@@ -29,5 +29,5 @@ class EchoActor extends Actor {
override def receive = {
case x => self reply x
- }
+ }
}
diff --git a/akka-spring/src/main/scala/StringReflect.scala b/akka-spring/src/main/scala/StringReflect.scala
index ae32350e2d..9e8cab8172 100644
--- a/akka-spring/src/main/scala/StringReflect.scala
+++ b/akka-spring/src/main/scala/StringReflect.scala
@@ -1,11 +1,11 @@
/**
* Copyright (C) 2009-2010 Scalable Solutions AB
*/
-
+
package se.scalablesolutions.akka.spring
object StringReflect {
-
+
/**
* Implicit conversion from String to StringReflect.
*/
@@ -22,4 +22,4 @@ class StringReflect(val self: String) {
val clazz = Class.forName(self)
clazz.asInstanceOf[Class[T]]
}
-}
\ No newline at end of file
+}
diff --git a/akka-spring/src/main/scala/TypedActorFactoryBean.scala b/akka-spring/src/main/scala/TypedActorFactoryBean.scala
index 7ba4cf5061..af792ab1fe 100644
--- a/akka-spring/src/main/scala/TypedActorFactoryBean.scala
+++ b/akka-spring/src/main/scala/TypedActorFactoryBean.scala
@@ -27,7 +27,7 @@ import se.scalablesolutions.akka.util.{Logging, Duration}
/**
* Exception to use when something goes wrong during bean creation.
- *
+ *
* @author Johan Rask
*/
class AkkaBeansException(message: String, cause:Throwable) extends BeansException(message, cause) {
@@ -158,7 +158,7 @@ class TypedActorFactoryBean extends AbstractFactoryBean[AnyRef] with Logging wit
if (transactional) config.makeTransactionRequired
config
}
-
+
def newInstanceFor[T <: AnyRef](clazz: Class[T]): T = {
var ref = clazz.newInstance().asInstanceOf[T]
postConstruct(setProperties(ref))
@@ -170,15 +170,15 @@ class TypedActorFactoryBean extends AbstractFactoryBean[AnyRef] with Logging wit
private[akka] def hasInterface = (interface != null) && (!interface.isEmpty)
- private[akka] def hasRestartCallbacks =
- ((pre != null) && !pre.isEmpty) ||
+ private[akka] def hasRestartCallbacks =
+ ((pre != null) && !pre.isEmpty) ||
((post != null) && !post.isEmpty)
private[akka] def hasShutdownCallback = ((shutdown != null) && !shutdown.isEmpty)
- private[akka] def hasDispatcher =
- (dispatcher != null) &&
- (dispatcher.dispatcherType != null) &&
+ private[akka] def hasDispatcher =
+ (dispatcher != null) &&
+ (dispatcher.dispatcherType != null) &&
(!dispatcher.dispatcherType.isEmpty)
private[akka] def dispatcherInstance: MessageDispatcher = {
diff --git a/akka-spring/src/test/scala/TypedActorFactoryBeanTest.scala b/akka-spring/src/test/scala/TypedActorFactoryBeanTest.scala
index 9fb500240b..1526517da7 100644
--- a/akka-spring/src/test/scala/TypedActorFactoryBeanTest.scala
+++ b/akka-spring/src/test/scala/TypedActorFactoryBeanTest.scala
@@ -82,7 +82,7 @@ class TypedActorFactoryBeanTest extends Spec with ShouldMatchers {
/*
// ------ NOTE: Can't work now when we only support POJO with interface -----
-
+
it("should create a proxy of type ResourceEditor") {
val bean = new TypedActorFactoryBean()
// we must have a java class here
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 03a91cbe6c..f2b1dd33bc 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -517,7 +517,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
"org.aopalliance.*;version=1.0.0",
// Provided by other bundles
- "!se.scalablesolutions.akka.*",
+ "!se.scalablesolutions.akka.*",
"!net.liftweb.*",
"!com.google.inject.*",
"!javax.transaction.*",
@@ -573,7 +573,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
val jms_1_1 = "org.apache.geronimo.specs" % "geronimo-jms_1.1_spec" % "1.1.1" % "compile" intransitive
val joda = "joda-time" % "joda-time" % "1.6" intransitive
- override def packageAction =
+ override def packageAction =
task {
val libs: Seq[Path] = managedClasspath(config("compile")).get.toSeq
val prjs: Seq[Path] = info.dependencies.toSeq.asInstanceOf[Seq[DefaultProject]] map { _.jarPath }
@@ -709,7 +709,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
!jar.toString.endsWith("scala-library-2.7.7.jar")
)
}
-
+
def akkaArtifacts = descendents(info.projectPath / "dist", "*" + buildScalaVersion + "-" + version + ".jar")
// ------------------------------------------------------------
diff --git a/project/plugins/Plugins.scala b/project/plugins/Plugins.scala
index b66ee5267e..ce3319b885 100644
--- a/project/plugins/Plugins.scala
+++ b/project/plugins/Plugins.scala
@@ -21,7 +21,7 @@ class Plugins(info: ProjectInfo) extends PluginDefinition(info) {
lazy val aquteModuleConfig = ModuleConfiguration("biz.aQute", AquteRepo)
lazy val codeFellowModuleConfig = ModuleConfiguration("de.tuxed", EmbeddedRepo)
lazy val spdeModuleConfig = ModuleConfiguration("us.technically.spde", DatabinderRepo)
-
+
// -------------------------------------------------------------------------------------------------------------------
// Dependencies
// -------------------------------------------------------------------------------------------------------------------