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

Merge conflict resolution

Browse source
This commit is contained in:
Viktor Klang 2012-06-19 23:06:26 +02:00
commit a0cf41b3ef
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
View file

@ -50,7 +50,6 @@ object Configuration {
def getCipherConfig(cipher: String, enabled: String*): CipherConfig = { def getCipherConfig(cipher: String, enabled: String*): CipherConfig = {
val localPort, remotePort = { val s = new java.net.ServerSocket(0); try s.getLocalPort finally s.close() } val localPort, remotePort = { val s = new java.net.ServerSocket(0); try s.getLocalPort finally s.close() }
try { try {
//if (true) throw new IllegalArgumentException("Ticket1978*Spec isn't enabled") //if (true) throw new IllegalArgumentException("Ticket1978*Spec isn't enabled")
val config = ConfigFactory.parseString(conf.format(localPort, trustStore, keyStore, cipher, enabled.mkString(", "))) val config = ConfigFactory.parseString(conf.format(localPort, trustStore, keyStore, cipher, enabled.mkString(", ")))