mirror of
https://github.com/corda/corda.git
synced 2025-03-17 17:45:17 +00:00
Merge remote-tracking branch 'remotes/open/master' into mnesbit-merge-20180702
# Conflicts: # node/src/test/kotlin/net/corda/node/services/vault/VaultQueryTests.kt
This commit is contained in:
parent
0f98a1cbcd
commit
042ac119a8
@ -54,7 +54,7 @@ abstract class AbstractAMQPSerializationScheme(
|
||||
constructor(cordapps: List<Cordapp>) : 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"
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user