diff options
Diffstat (limited to 'java/src/IceInternal/Reference.java')
| -rw-r--r-- | java/src/IceInternal/Reference.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java index 79c8edc244d..37f18af69e9 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/IceInternal/Reference.java @@ -341,7 +341,8 @@ public final class Reference { RouterInfo newRouterInfo = instance.routerManager().get(newRouter); - if (newRouterInfo.equals(routerInfo)) + if ((routerInfo == newRouterInfo) || + (routerInfo != null && newRouterInfo != null && newRouterInfo.equals(routerInfo))) { return this; } |