From 10035860eb9acd34737d55de7e663cfb9bbf61e0 Mon Sep 17 00:00:00 2001 From: Clinton Alexander Date: Wed, 10 Aug 2016 16:17:14 +0100 Subject: [PATCH] Added immatuable serialisers to Kyro. --- .../main/kotlin/com/r3corda/core/serialization/Kryo.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt b/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt index 40de651303..38dcdc130c 100644 --- a/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt +++ b/core/src/main/kotlin/com/r3corda/core/serialization/Kryo.kt @@ -16,6 +16,7 @@ import com.r3corda.core.node.services.AttachmentStorage import com.r3corda.core.utilities.NonEmptySet import com.r3corda.core.utilities.NonEmptySetSerializer import de.javakaffee.kryoserializers.ArraysAsListSerializer +import de.javakaffee.kryoserializers.guava.* import net.i2p.crypto.eddsa.EdDSAPrivateKey import net.i2p.crypto.eddsa.EdDSAPublicKey import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec @@ -357,7 +358,13 @@ fun createKryo(k: Kryo = Kryo()): Kryo { /** This ensures any kotlin objects that implement [DeserializeAsKotlinObjectDef] are read back in as singletons. */ addDefaultSerializer(DeserializeAsKotlinObjectDef::class.java, KotlinObjectSerializer) - + + ImmutableListSerializer.registerSerializers(k) + ImmutableSetSerializer.registerSerializers(k) + ImmutableSortedSetSerializer.registerSerializers(k) + ImmutableMapSerializer.registerSerializers(k) + ImmutableMultimapSerializer.registerSerializers(k) + noReferencesWithin() } }