From 042ac119a835b87218ef7f8c04ad6dd81766d20b Mon Sep 17 00:00:00 2001 From: Matthew Nesbit Date: Mon, 2 Jul 2018 11:31:37 +0100 Subject: [PATCH] Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702 # Conflicts: # node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt --- .../serialization/internal/amqp/AMQPSerializationScheme.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializationScheme.kt b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializationScheme.kt index c5b8855e49..68cbb51dbf 100644 --- a/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializationScheme.kt +++ b/serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializationScheme.kt @@ -54,7 +54,7 @@ abstract class AbstractAMQPSerializationScheme( constructor(cordapps: List) : this(cordapps.customSerializers, ConcurrentHashMap()) // TODO: This method of initialisation for the Whitelist and plugin serializers will have to change - // when we have per-cordapp contexts and dynamic app reloading but for now it's the easiest way + // when we have per-cordapp contexts and dynamic app reloading but for now it's the easiest way companion object { const val SCAN_SPEC_PROP_NAME = "amqp.custom.serialization.scanSpec"