From 28570d92e9cf351a47553d8a69564efbbc46cbb4 Mon Sep 17 00:00:00 2001 From: nathan Date: Thu, 3 Sep 2020 11:15:37 +0200 Subject: [PATCH] Fixed invalid object test case --- src/dorkbox/network/rmi/messages/RmiServerSerializer.kt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/dorkbox/network/rmi/messages/RmiServerSerializer.kt b/src/dorkbox/network/rmi/messages/RmiServerSerializer.kt index a9723a75..61e73620 100644 --- a/src/dorkbox/network/rmi/messages/RmiServerSerializer.kt +++ b/src/dorkbox/network/rmi/messages/RmiServerSerializer.kt @@ -40,7 +40,6 @@ import com.esotericsoftware.kryo.io.Input import com.esotericsoftware.kryo.io.Output import dorkbox.network.rmi.RemoteObjectStorage import dorkbox.network.serialization.KryoExtra -import dorkbox.network.serialization.Serialization.Companion.INVALID_KRYO_ID /** * This is to manage serializing RMI objects across the wire... @@ -110,14 +109,14 @@ class RmiServerSerializer : Serializer(false) { return if (interfaceClass.isInterface) { // normal case. RMI only on 1 side - val kryoId = serialization.rmiHolder.ifaceToId[interfaceClass]!! - require(kryoId != INVALID_KRYO_ID) { "Registration for $interfaceClass is invalid!!" } + val kryoId = serialization.rmiHolder.ifaceToId[interfaceClass] + require(kryoId != null) { "Registration for $interfaceClass is invalid!!" } connection.rmiConnectionSupport.getProxyObject(connection, kryoId, rmiId, interfaceClass) } else { // BI-DIRECTIONAL RMI -- THIS IS NOT NORMAL! // this won't be an interface. It will be an impl (because of how RMI is setup) - val kryoId = serialization.rmiHolder.implToId[interfaceClass]!! - require(kryoId != INVALID_KRYO_ID) { "Registration for $interfaceClass is invalid!!" } + val kryoId = serialization.rmiHolder.implToId[interfaceClass] + require(kryoId != null) { "Registration for $interfaceClass is invalid!!" } val iface = serialization.rmiHolder.idToIface[kryoId] connection.rmiConnectionSupport.getProxyObject(connection, kryoId, rmiId, iface) }