From c54d20eae6f1d97f79c086031013cdffeba49b99 Mon Sep 17 00:00:00 2001
From: nathan <nathan@dorkbox.com>
Date: Thu, 25 Oct 2018 21:36:00 +0200
Subject: [PATCH] Fixed internal issue where RMI object was null (since it
 didn't exist) and we would try to add it to internal maps anyways.

---
 src/dorkbox/network/rmi/RmiObjectLocalHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/dorkbox/network/rmi/RmiObjectLocalHandler.java b/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
index 5b824c7e..77d8bd98 100644
--- a/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
+++ b/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
@@ -186,7 +186,7 @@ class RmiObjectLocalHandler extends RmiObjectHandler {
                     // connections -- even if this "slows down" the speed/performance of what "local" connections offer.
                     proxyObject = connection.getProxyObject(registration.rmiId, interfaceClass);
 
-                    if (proxyObject != null) {
+                    if (proxyObject != null && registration.remoteObject != null) {
                         // have to save A and B so we can correctly switch as necessary
                         //noinspection SynchronizeOnNonFinalField
                         synchronized (implToProxy) {