summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/Reference.java
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2002-01-30 00:12:02 +0000
committerMark Spruiell <mes@zeroc.com>2002-01-30 00:12:02 +0000
commit122a4ca5831e6612cf603920405c1200b43450c3 (patch)
tree1005701fd4a96d4731a8e86a2e5557805ac9376d /java/src/IceInternal/Reference.java
parentAdded SecureUdp.ice to the Makefile. (diff)
downloadice-122a4ca5831e6612cf603920405c1200b43450c3.tar.bz2
ice-122a4ca5831e6612cf603920405c1200b43450c3.tar.xz
ice-122a4ca5831e6612cf603920405c1200b43450c3.zip
bug fix
Diffstat (limited to 'java/src/IceInternal/Reference.java')
-rw-r--r--java/src/IceInternal/Reference.java3
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;
}