From a9ff1ac2620278d7ec3b414e8cb9cc40c2006ca9 Mon Sep 17 00:00:00 2001 From: Katelyn Baker Date: Thu, 17 May 2018 15:21:37 +0100 Subject: [PATCH] OS MERGE Looks like Max Message size causes all sorts of issues in the bridge, some fixes to some issues but this needs a lot more work --- bridge/build.gradle | 4 ++++ .../main/kotlin/net/corda/bridge/internal/BridgeInstance.kt | 2 +- node/src/main/kotlin/net/corda/node/internal/Node.kt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bridge/build.gradle b/bridge/build.gradle index 545afed651..b463db900a 100644 --- a/bridge/build.gradle +++ b/bridge/build.gradle @@ -47,6 +47,10 @@ dependencies { transitive = false// we control dependencies directly as the bridge is likely to be audited } + compile(project(':node')) { + transitive = false// we control dependencies directly as the bridge is likely to be audited + } + // Here we pull in dependencies that would normally be pulled in transitively from :core and :node-api, but we need more fine grained control // For AMQP serialisation. compile "org.apache.qpid:proton-j:${protonj_version}" diff --git a/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt b/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt index 6aa739a08a..4a87e8b781 100644 --- a/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt +++ b/bridge/src/main/kotlin/net/corda/bridge/internal/BridgeInstance.kt @@ -27,6 +27,7 @@ import net.corda.core.serialization.internal.SerializationEnvironmentImpl import net.corda.core.serialization.internal.effectiveSerializationEnv import net.corda.core.serialization.internal.nodeSerializationEnv import net.corda.core.utilities.contextLogger +import net.corda.node.serialization.amqp.AMQPServerSerializationScheme import net.corda.nodeapi.internal.ShutdownHook import net.corda.nodeapi.internal.addShutdownHook import net.corda.nodeapi.internal.network.NETWORK_PARAMS_FILE_NAME @@ -34,7 +35,6 @@ import net.corda.nodeapi.internal.network.SignedNetworkParameters import net.corda.nodeapi.internal.serialization.AMQP_P2P_CONTEXT import net.corda.nodeapi.internal.serialization.AMQP_STORAGE_CONTEXT import net.corda.nodeapi.internal.serialization.SerializationFactoryImpl -import net.corda.nodeapi.internal.serialization.amqp.AMQPServerSerializationScheme import rx.Subscription import java.util.concurrent.atomic.AtomicBoolean diff --git a/node/src/main/kotlin/net/corda/node/internal/Node.kt b/node/src/main/kotlin/net/corda/node/internal/Node.kt index 56f980996a..f8d2ba70aa 100644 --- a/node/src/main/kotlin/net/corda/node/internal/Node.kt +++ b/node/src/main/kotlin/net/corda/node/internal/Node.kt @@ -108,7 +108,7 @@ open class Node(configuration: NodeConfiguration, const val scanPackagesSeparator = "," @JvmStatic - private fun makeCordappLoader(configuration: NodeConfiguration, versionInfo: VersionInfo): CordappLoader { + protected fun makeCordappLoader(configuration: NodeConfiguration, versionInfo: VersionInfo): CordappLoader { return System.getProperty(scanPackagesSystemProperty)?.let { scanPackages -> CordappLoader.createDefaultWithTestPackages(configuration, scanPackages.split(scanPackagesSeparator), versionInfo)