ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-06-01 07:00:54 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge fixup

Browse Source
This commit is contained in:
Ryan Fowler 2025-03-14 13:57:05 +00:00
parent 363876a958
commit cee8df1bd0
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
node/src/main/kotlin/net/corda/node/internal/Node.kt
View File

@ -269,9 +269,6 @@ open class Node(configuration: NodeConfiguration,
User(INTERNAL_SHELL_USER, internalShellPassword, setOf(Permissions.all()))) else this User(INTERNAL_SHELL_USER, internalShellPassword, setOf(Permissions.all()))) else this
} }
// When using external Artemis, the node's p2pSslOptions are no longer used for RPC.
val rpcSslOptions = configuration.enterpriseConfiguration.messagingServerSslConfiguration ?: configuration.p2pSslOptions
val messageBroker = if (!configuration.messagingServerExternal) { val messageBroker = if (!configuration.messagingServerExternal) {
val brokerBindAddress = configuration.messagingServerAddress val brokerBindAddress = configuration.messagingServerAddress
?: NetworkHostAndPort("0.0.0.0", configuration.p2pAddress.port) ?: NetworkHostAndPort("0.0.0.0", configuration.p2pAddress.port)
@ -282,7 +279,7 @@ open class Node(configuration: NodeConfiguration,
threadPoolName = "P2PAndRPCServer", threadPoolName = "P2PAndRPCServer",
rpcAddresses = BrokerAddresses(configuration.rpcOptions.address, configuration.rpcOptions.adminAddress), rpcAddresses = BrokerAddresses(configuration.rpcOptions.address, configuration.rpcOptions.adminAddress),
rpcSecurityManager = securityManager, rpcSecurityManager = securityManager,
rpcSslOptions = rpcSslOptions) rpcSslOptions = configuration.p2pSslOptions)
} }
} else { } else {
null null

1
node/src/main/kotlin/net/corda/node/services/rpc/ArtemisRpcBroker.kt
View File

@ -4,7 +4,6 @@ import net.corda.core.internal.errors.AddressBindingException
import net.corda.core.utilities.NetworkHostAndPort import net.corda.core.utilities.NetworkHostAndPort
import net.corda.core.utilities.debug import net.corda.core.utilities.debug
import net.corda.core.utilities.loggerFor import net.corda.core.utilities.loggerFor
import net.corda.ext.internal.rpc.security.RPCSecurityManager
import net.corda.node.internal.artemis.ArtemisBroker import net.corda.node.internal.artemis.ArtemisBroker
import net.corda.node.internal.artemis.BrokerAddresses import net.corda.node.internal.artemis.BrokerAddresses
import net.corda.node.internal.artemis.BrokerJaasLoginModule import net.corda.node.internal.artemis.BrokerJaasLoginModule