ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-25 19:11:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Change PreventSubscriptionsSubject#errorAction to be more specific; to return an Exception

Browse Source
This commit is contained in:
Kyriakos Tharrouniatis 2020-02-16 23:31:33 +00:00
parent 2c0e4396d1
commit 2fffef5701
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/src/main/kotlin/net/corda/node/internal/FlowSafeSubject.kt
View File

@ -40,9 +40,9 @@ class FlowSafeSubject<T, R>(private val actual: Subject<T, R>) : Observer<T> by
/**
* The [PreventSubscriptionsSubject] is used to prevent any subscriptions to its underlying [Subject].
*/
class PreventSubscriptionsSubject<T, R>(private val actual: Subject<T, R>, errorAction: () -> Unit) : Observer<T> by actual,
class PreventSubscriptionsSubject<T, R>(private val actual: Subject<T, R>, errorAction: () -> Exception) : Observer<T> by actual,
Subject<T, R>(OnSubscribe<R> { _ ->
errorAction()
throw errorAction()
}) {
override fun hasObservers(): Boolean {

2
node/src/main/kotlin/net/corda/node/services/vault/NodeVaultService.kt
View File

@ -226,7 +226,7 @@ class NodeVaultService(
"- aborting the flow "
)
throw FlowException(
FlowException(
"Flow ${it.logic::class.java.name} tried to subscribe an Rx.Observer to VaultService.rawUpdates " +
"- Rx.Observables should only be subscribed outside the context of a flow " +
"- the subscription did not succeed "