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

Address Viktor's comments

Browse Source
This commit is contained in:
Dimos Raptis 2020-09-23 10:40:53 +01:00
parent c263b75894
commit f4fa08ed10
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
node/src/main/kotlin/net/corda/node/services/statemachine/SingleThreadedStateMachineManager.kt
View File

@ -707,7 +707,8 @@ internal class SingleThreadedStateMachineManager(
val sender = serviceHub.networkMapCache.getPeerByLegalName(peer)
if (sender != null) {
when (sessionMessage) {
is ExistingSessionMessage -> onExistingSessionMessage(sessionMessage, sender, event, event.receivedMessage.uniqueMessageId, event.receivedMessage.senderUUID, event.receivedMessage.senderSeqNo)
is ExistingSessionMessage -> onExistingSessionMessage(sessionMessage, sender, event,
event.receivedMessage.uniqueMessageId, event.receivedMessage.senderUUID, event.receivedMessage.senderSeqNo)
is InitialSessionMessage -> onSessionInit(sessionMessage, sender, event)
}
} else {

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

@ -244,7 +244,6 @@ data class Checkpoint(
}
/**
<<<<<<< HEAD
* @param invocationContext The initiator of the flow.
* @param ourIdentity The identity the flow is run as.
* @param sessions Map of source session ID to session state.

2
node/src/main/resources/migration/node-core.changelog-v21.xml
View File

@ -23,6 +23,8 @@
</column>
</createTable>
<addPrimaryKey columnNames="session_id" constraintName="node_session_data_pk" tableName="node_session_data"/>
<dropTable tableName="node_message_ids"/>
</changeSet>
</databaseChangeLog>