ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-14 21:28:14 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix bad merge

Browse Source
This commit is contained in:
Matthew Nesbit
2018-11-12 10:35:40 +00:00
parent d54e63e356
commit 4ca03abaac
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
node-api/src/test/kotlin/net/corda/nodeapi/internal/bully/BullyLeaderTest.kt
View File

@ -11,7 +11,7 @@ import net.corda.node.services.config.configureWithDevSSLCertificate
import net.corda.node.services.messaging.ArtemisMessagingServer import net.corda.node.services.messaging.ArtemisMessagingServer
import net.corda.nodeapi.internal.ArtemisMessagingClient import net.corda.nodeapi.internal.ArtemisMessagingClient
import net.corda.nodeapi.internal.ArtemisSessionProvider import net.corda.nodeapi.internal.ArtemisSessionProvider
import net.corda.nodeapi.internal.config.ExternalBrokerConnectionConfiguration import net.corda.nodeapi.internal.config.MessagingServerConnectionConfiguration
import net.corda.nodeapi.internal.zookeeper.CordaLeaderListener import net.corda.nodeapi.internal.zookeeper.CordaLeaderListener
import net.corda.testing.core.DUMMY_BANK_A_NAME import net.corda.testing.core.DUMMY_BANK_A_NAME
import net.corda.testing.core.MAX_MESSAGE_SIZE import net.corda.testing.core.MAX_MESSAGE_SIZE
@ -413,7 +413,7 @@ class BullyLeaderTest {
val CLIENTS_NUMBER = 10 val CLIENTS_NUMBER = 10
val ACTIONS_NUMBER = 10 val ACTIONS_NUMBER = 10
val artemisServer = createArtemisServer() val artemisServer = createArtemisServer()
artemisServer.use { server -> artemisServer.use { _ ->
val countDownLatch = CountDownLatch(CLIENTS_NUMBER) val countDownLatch = CountDownLatch(CLIENTS_NUMBER)
val leaderCount = AtomicInteger(0) val leaderCount = AtomicInteger(0)
val failureRef = AtomicBoolean(false) val failureRef = AtomicBoolean(false)
@ -492,7 +492,7 @@ class BullyLeaderTest {
NetworkHostAndPort("localhost", port), NetworkHostAndPort("localhost", port),
MAX_MESSAGE_SIZE, MAX_MESSAGE_SIZE,
confirmationWindowSize = artemisConfig.enterpriseConfiguration.tuning.p2pConfirmationWindowSize, confirmationWindowSize = artemisConfig.enterpriseConfiguration.tuning.p2pConfirmationWindowSize,
externalBrokerConnectionConfig = ExternalBrokerConnectionConfiguration.CONTINUOUS_RETRY) messagingServerConnectionConfig = MessagingServerConnectionConfiguration.CONTINUOUS_RETRY)
if (started) { if (started) {
artemisClient.start() artemisClient.start()
} }