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

Merge pull request #5958 from corda/chrisr3-44-merge

Browse Source 
Merge from OS 4.4 up to 117108f.
This commit is contained in:
Rick Parker 2020-02-13 13:12:41 +00:00 committed by GitHub
commit edf0c25e21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/rpc/src/main/kotlin/net/corda/client/rpc/CordaRPCClient.kt
View File

@ -20,7 +20,6 @@ import net.corda.core.serialization.SerializationWhitelist
import net.corda.core.serialization.internal.effectiveSerializationEnv import net.corda.core.serialization.internal.effectiveSerializationEnv
import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.days import net.corda.core.utilities.days
import net.corda.core.utilities.loggerFor
import net.corda.core.utilities.minutes import net.corda.core.utilities.minutes
import net.corda.core.utilities.seconds import net.corda.core.utilities.seconds
import net.corda.nodeapi.internal.ArtemisTcpTransport.Companion.rpcConnectorTcpTransport import net.corda.nodeapi.internal.ArtemisTcpTransport.Companion.rpcConnectorTcpTransport
@ -614,7 +613,8 @@ class CordaRPCClient private constructor(
addresses, addresses,
configuration, configuration,
gracefulReconnect, gracefulReconnect,
sslConfiguration sslConfiguration,
classLoader
) )
} else { } else {
CordaRPCConnection(getRpcClient().start( CordaRPCConnection(getRpcClient().start(