Merged fix for TwoPartyTradeFlow not finding the seller identity

This commit is contained in:
Christian Sailer 2017-10-19 10:44:20 +01:00
parent 3297be4a07
commit 35ef7d19da

View File

@ -202,8 +202,8 @@ object TwoPartyTradeFlow {
// Register the identity we're about to send payment to. This shouldn't be the same as the asset owner // Register the identity we're about to send payment to. This shouldn't be the same as the asset owner
// identity, so that anonymity is enforced. // identity, so that anonymity is enforced.
val wellKnownPayToIdentity = serviceHub.identityService.verifyAndRegisterIdentity(it.payToIdentity) val wellKnownPayToIdentity = serviceHub.identityService.verifyAndRegisterIdentity(it.payToIdentity) ?: it.payToIdentity
require(wellKnownPayToIdentity?.party == sellerSession.counterparty) { "Well known identity to pay to must match counterparty identity" } require(wellKnownPayToIdentity.party == sellerSession.counterparty) { "Well known identity to pay to must match counterparty identity" }
if (it.price > acceptablePrice) if (it.price > acceptablePrice)
throw UnacceptablePriceException(it.price) throw UnacceptablePriceException(it.price)