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

Removing ChannelLocalSystem (binary incompat change) as well as increasing timeout for ConcurrentSocketActorSpec

Browse source
This commit is contained in:
Viktor Klang 2012-04-30 16:26:11 +02:00
parent 5a9483047c
commit 7cb67ce0ee
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
akka-remote/src/main/scala/akka/remote/netty/Server.scala
View file

@ -129,10 +129,6 @@ class RemoteServerAuthenticationHandler(secureCookie: Option[String]) extends Si
} }
} }
object ChannelLocalSystem extends ChannelLocal[ActorSystemImpl] {
override def initialValue(ch: Channel): ActorSystemImpl = null
}
@ChannelHandler.Sharable @ChannelHandler.Sharable
class RemoteServerHandler( class RemoteServerHandler(
val openChannels: ChannelGroup, val openChannels: ChannelGroup,

5
akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
View file

@ -7,8 +7,11 @@ import org.scalatest.matchers.MustMatchers
import akka.testkit.{ TestProbe, DefaultTimeout, AkkaSpec } import akka.testkit.{ TestProbe, DefaultTimeout, AkkaSpec }
import akka.util.duration._ import akka.util.duration._
import akka.actor.{ Cancellable, Actor, Props, ActorRef } import akka.actor.{ Cancellable, Actor, Props, ActorRef }
import akka.util.Timeout
class ConcurrentSocketActorSpec extends AkkaSpec with DefaultTimeout { class ConcurrentSocketActorSpec extends AkkaSpec {
implicit val timeout: Timeout = Timeout(15 seconds)
def checkZeroMQInstallation = def checkZeroMQInstallation =
try { try {