From fbe234574e2530f12d3ed8e3dded733f5f234748 Mon Sep 17 00:00:00 2001
From: Joseph Zuniga-Daly <joseph.zunigadaly@r3.com>
Date: Wed, 24 Jun 2020 12:58:40 +0100
Subject: [PATCH] Tidy up the fetching of types

---
 .../serialization/kryo/CustomSerializerCheckpointAdaptor.kt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/CustomSerializerCheckpointAdaptor.kt b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/CustomSerializerCheckpointAdaptor.kt
index 7f98d8484e..d8955e41c8 100644
--- a/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/CustomSerializerCheckpointAdaptor.kt
+++ b/node-api/src/main/kotlin/net/corda/nodeapi/internal/serialization/kryo/CustomSerializerCheckpointAdaptor.kt
@@ -15,9 +15,11 @@ class CustomSerializerCheckpointAdaptor<OBJ, PROXY>(private val userSerializer :
     val cordappType: Type
 
     init {
-        val types = userSerializer::class.supertypes.filter { it.jvmErasure == SerializationCustomSerializer::class }
+        val types: List<Type> = userSerializer::class
+                .supertypes
+                .filter { it.jvmErasure == SerializationCustomSerializer::class }
                 .flatMap { it.arguments }
-                .map { it.type!!.javaType }
+                .mapNotNull { it.type?.javaType }
 
         // We are expecting a cordapp type and a proxy type.
         // We will only use the cordapp type in this class