Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Removing ChannelLocalSystem (binary incompat change) as well as incre…

…asing timeout for ConcurrentSocketActorSpec
  • Loading branch information...
commit 7cb67ce0ee8f50ce39d31030073acd6f0a87a43c 1 parent 5a94830
@viktorklang viktorklang authored
View
4 akka-remote/src/main/scala/akka/remote/netty/Server.scala
@@ -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
class RemoteServerHandler(
val openChannels: ChannelGroup,
View
5 akka-zeromq/src/test/scala/akka/zeromq/ConcurrentSocketActorSpec.scala
@@ -7,8 +7,11 @@ import org.scalatest.matchers.MustMatchers
import akka.testkit.{ TestProbe, DefaultTimeout, AkkaSpec }
import akka.util.duration._
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 =
try {
Please sign in to comment.
Something went wrong with that request. Please try again.