raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Merge commit '38e8bea3fe'

Browse source 
Conflicts:
	akka-core/src/main/scala/actor/ActorRef.scala
	akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
	akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/RemoteSupervisorSpec.scala
	akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
	akka-core/src/test/scala/SupervisorSpec.scala
	akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
This commit is contained in:
Jonas Bonér 2010-07-01 17:21:17 +02:00
commit 1a7d7966c0
6 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-core/src/test/java/se/scalablesolutions/akka/actor/ActiveObjectFailer.java
View file

@ -2,6 +2,6 @@ package se.scalablesolutions.akka.actor;
public class ActiveObjectFailer implements java.io.Serializable { public class ActiveObjectFailer implements java.io.Serializable {
public int fail() { public int fail() {
throw new RuntimeException("Expected exception; to test fault-tolerance"); throw new RuntimeException("expected");
} }
} }

6
akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
View file

@ -20,9 +20,15 @@ import se.scalablesolutions.akka.actor._
/* /*
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class NestedTransactionalActiveObjectSpec extends class NestedTransactionalActiveObjectSpec extends
<<<<<<< HEAD:akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
Spec with Spec with
ShouldMatchers with ShouldMatchers with
BeforeAndAfterAll { BeforeAndAfterAll {
=======
Spec with
ShouldMatchers with
BeforeAndAfterAll {
>>>>>>> 38e8bea3fe6a7e9fcc9c5f353124144739bdc234:akka-core/src/test/scala/NestedTransactionalActiveObjectSpec.scala
private val conf = new ActiveObjectConfigurator private val conf = new ActiveObjectConfigurator
private var messageLog = "" private var messageLog = ""

2
akka-core/src/test/scala/RemoteSupervisorSpec.scala
View file

@ -75,7 +75,7 @@ object Log {
object RemoteSupervisorSpec { object RemoteSupervisorSpec {
val HOSTNAME = "localhost" val HOSTNAME = "localhost"
val PORT = 9990 val PORT = 9988
var server: RemoteServer = null var server: RemoteServer = null
} }

3
akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala
View file

@ -31,6 +31,9 @@ class RemoteTransactionalActiveObjectSpec extends
import RemoteTransactionalActiveObjectSpec._ import RemoteTransactionalActiveObjectSpec._
Config.config Config.config
server = new RemoteServer()
server.start(HOSTNAME, PORT)
private val conf = new ActiveObjectConfigurator private val conf = new ActiveObjectConfigurator
private var messageLog = "" private var messageLog = ""

6
akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
View file

@ -19,9 +19,15 @@ import se.scalablesolutions.akka.actor._
/* /*
@RunWith(classOf[JUnitRunner]) @RunWith(classOf[JUnitRunner])
class TransactionalActiveObjectSpec extends class TransactionalActiveObjectSpec extends
<<<<<<< HEAD:akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
Spec with Spec with
ShouldMatchers with ShouldMatchers with
BeforeAndAfterAll { BeforeAndAfterAll {
=======
Spec with
ShouldMatchers with
BeforeAndAfterAll {
>>>>>>> 38e8bea3fe6a7e9fcc9c5f353124144739bdc234:akka-core/src/test/scala/TransactionalActiveObjectSpec.scala
private val conf = new ActiveObjectConfigurator private val conf = new ActiveObjectConfigurator
private var messageLog = "" private var messageLog = ""