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

Small tweaks useful for the experimental C++ support.

Browse Source
This commit is contained in:
Mike Hearn 2018-11-16 17:26:27 +00:00
parent a867e7cb8b
commit 38a4737764
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/AMQPSerializationScheme.kt
View File

@ -172,7 +172,7 @@ abstract class AbstractAMQPSerializationScheme(
// Not used as a simple direct import to facilitate testing // Not used as a simple direct import to facilitate testing
open val publicKeySerializer: CustomSerializer<*> = net.corda.serialization.internal.amqp.custom.PublicKeySerializer open val publicKeySerializer: CustomSerializer<*> = net.corda.serialization.internal.amqp.custom.PublicKeySerializer
private fun getSerializerFactory(context: SerializationContext): SerializerFactory { fun getSerializerFactory(context: SerializationContext): SerializerFactory {
val key = Pair(context.whitelist, context.deserializationClassLoader) val key = Pair(context.whitelist, context.deserializationClassLoader)
// ConcurrentHashMap.get() is lock free, but computeIfAbsent is not, even if the key is in the map already. // ConcurrentHashMap.get() is lock free, but computeIfAbsent is not, even if the key is in the map already.
return serializerFactoriesForContexts[key] ?: serializerFactoriesForContexts.computeIfAbsent(key) { return serializerFactoriesForContexts[key] ?: serializerFactoriesForContexts.computeIfAbsent(key) {

2
serialization/src/main/kotlin/net/corda/serialization/internal/amqp/PropertySerializers.kt
View File

@ -52,6 +52,8 @@ class PublicPropertyReader(private val readMethod: Method) : PropertyReader() {
} }
override fun isNullable(): Boolean = readMethod.returnsNullable() override fun isNullable(): Boolean = readMethod.returnsNullable()
val genericReturnType get() = readMethod.genericReturnType
} }
/** /**