ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-24 18:50:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1025 from corda/merges/june-19-17-37

Browse Source
This commit is contained in:
Michele Sollecito 2018-06-19 17:41:55 +01:00 committed by GitHub
commit 80d7c28606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
constants.properties
View File

@ -1,4 +1,3 @@
gradlePluginsVersion=4.0.24
# #
# R3 Proprietary and Confidential # R3 Proprietary and Confidential
# #
@ -9,7 +8,7 @@ gradlePluginsVersion=4.0.24
# Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited. # Distribution of this file or any portion thereof via any medium without the express permission of R3 is strictly prohibited.
# #
gradlePluginsVersion=4.0.23 gradlePluginsVersion=4.0.25
kotlinVersion=1.2.50 kotlinVersion=1.2.50
platformVersion=4 platformVersion=4
guavaVersion=21.0 guavaVersion=21.0

1
node/src/main/kotlin/net/corda/node/services/statemachine/FlowMonitor.kt
View File

@ -71,6 +71,7 @@ internal class FlowMonitor constructor(private val retrieveFlows: () -> Set<Flow
is FlowIORequest.Sleep -> "to wake up from sleep ending at ${LocalDateTime.ofInstant(request.wakeUpAfter, ZoneId.systemDefault())}" is FlowIORequest.Sleep -> "to wake up from sleep ending at ${LocalDateTime.ofInstant(request.wakeUpAfter, ZoneId.systemDefault())}"
FlowIORequest.WaitForSessionConfirmations -> "for sessions to be confirmed" FlowIORequest.WaitForSessionConfirmations -> "for sessions to be confirmed"
is FlowIORequest.ExecuteAsyncOperation -> "for asynchronous operation of type ${request.operation::javaClass} to complete" is FlowIORequest.ExecuteAsyncOperation -> "for asynchronous operation of type ${request.operation::javaClass} to complete"
FlowIORequest.ForceCheckpoint -> "for forcing a checkpoint at an arbitrary point in a flow"
} }
) )
message.append(".") message.append(".")