ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-28 16:58:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

CORDA-696: Fix incorrect merge conflict resolution, fix filename typo

Browse Source
This commit is contained in:
Andrius Dagys 2018-02-26 18:43:25 +00:00
parent 9814ea6f34
commit 59a6ced423
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/src/main/kotlin/net/corda/node/internal/ServiesForResolutionImpl.kt → node/src/main/kotlin/net/corda/node/internal/ServicesForResolutionImpl.kt
View File

@ -23,10 +23,10 @@ data class ServicesForResolutionImpl(
@Throws(TransactionResolutionException::class) @Throws(TransactionResolutionException::class)
override fun loadStates(stateRefs: Set<StateRef>): Set<StateAndRef<ContractState>> { override fun loadStates(stateRefs: Set<StateRef>): Set<StateAndRef<ContractState>> {
return stateRefs.groupBy { it.txhash }.map { return stateRefs.groupBy { it.txhash }.flatMap {
val stx = validatedTransactions.getTransaction(it.key) ?: throw TransactionResolutionException(it.key) val stx = validatedTransactions.getTransaction(it.key) ?: throw TransactionResolutionException(it.key)
val baseTx = stx.resolveBaseTransaction(this) val baseTx = stx.resolveBaseTransaction(this)
it.value.map { StateAndRef(baseTx.outputs[it.index], it) } it.value.map { StateAndRef(baseTx.outputs[it.index], it) }
}.flatMap { it }.toSet() }.toSet()
} }
} }