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

Merged in colljos-kryo-observable-registration (pull request #544)

Browse Source 
Kryo registration of Observable with explicit ID.
This commit is contained in:
Jose Coll
2016-11-28 13:31:51 +00:00
parent 92d14d7582 f6f896d072
commit bc3550e3e6
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
node/src/main/kotlin/net/corda/node/services/messaging/RPCStructures.kt
View File

@ -229,7 +229,8 @@ private class RPCKryo(observableSerializer: Serializer<Observable<Any>>? = null)
}) })
} }
val observableRegistration: Registration? = if (observableSerializer != null) register(Observable::class.java, observableSerializer) else null // TODO: workaround to prevent Observable registration conflict when using plugin registered kyro classes
val observableRegistration: Registration? = if (observableSerializer != null) register(Observable::class.java, observableSerializer, 10000) else null
override fun getRegistration(type: Class<*>): Registration { override fun getRegistration(type: Class<*>): Registration {
if (Observable::class.java.isAssignableFrom(type)) if (Observable::class.java.isAssignableFrom(type))