ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-19 13:08:04 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-1622 Fix misuse of volatile (#3375)

Browse Source
This commit is contained in:
Rick Parker 2018-06-15 14:51:47 +01:00 committed by GitHub
parent 3e98efe04b
commit 92d44bf68a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
node/src/test/kotlin/net/corda/node/services/statemachine/RetryFlowMockTest.kt
View File

@ -30,6 +30,7 @@ import org.junit.Test
import java.sql.SQLException import java.sql.SQLException
import java.time.Duration import java.time.Duration
import java.util.* import java.util.*
import java.util.concurrent.atomic.AtomicInteger
import kotlin.test.assertEquals import kotlin.test.assertEquals
import kotlin.test.assertNotNull import kotlin.test.assertNotNull
import kotlin.test.assertNull import kotlin.test.assertNull
@ -48,7 +49,7 @@ class RetryFlowMockTest {
RetryFlow.count = 0 RetryFlow.count = 0
SendAndRetryFlow.count = 0 SendAndRetryFlow.count = 0
RetryInsertFlow.count = 0 RetryInsertFlow.count = 0
KeepSendingFlow.count = 0 KeepSendingFlow.count.set(0)
} }
private fun <T> StartedNode<MockNode>.startFlow(logic: FlowLogic<T>): CordaFuture<T> { private fun <T> StartedNode<MockNode>.startFlow(logic: FlowLogic<T>): CordaFuture<T> {
@ -115,7 +116,7 @@ class RetryFlowMockTest {
} }
}) })
// Now short circuit the iterations so the flow finishes soon. // Now short circuit the iterations so the flow finishes soon.
KeepSendingFlow.count = count - 2 KeepSendingFlow.count.set(count - 2)
while (nodeA.smm.allStateMachines.size > 0) { while (nodeA.smm.allStateMachines.size > 0) {
Thread.sleep(10) Thread.sleep(10)
} }
@ -240,8 +241,7 @@ class ReceiveFlow2(private val other: FlowSession) : FlowLogic<Unit>() {
@InitiatingFlow @InitiatingFlow
class KeepSendingFlow(private val i: Int, private val other: Party) : FlowLogic<Unit>() { class KeepSendingFlow(private val i: Int, private val other: Party) : FlowLogic<Unit>() {
companion object { companion object {
@Volatile val count = AtomicInteger(0)
var count = 0
} }
@Suspendable @Suspendable
@ -251,7 +251,7 @@ class KeepSendingFlow(private val i: Int, private val other: Party) : FlowLogic<
do { do {
logger.info("Sending... $count") logger.info("Sending... $count")
session.send("Boo") session.send("Boo")
} while (count++ < i) } while (count.getAndIncrement() < i)
} }
} }