diff options
| author | Marc Laukien <marc@zeroc.com> | 2004-02-20 18:14:39 +0000 |
|---|---|---|
| committer | Marc Laukien <marc@zeroc.com> | 2004-02-20 18:14:39 +0000 |
| commit | 2eb88bcfdd9039a1ef9660f1c6a25ae0063782e7 (patch) | |
| tree | 26b4be424b828e28703ac8aa01188d296d179731 /java/src/IceInternal/Reference.java | |
| parent | C++ -> Java (diff) | |
| download | ice-2eb88bcfdd9039a1ef9660f1c6a25ae0063782e7.tar.bz2 ice-2eb88bcfdd9039a1ef9660f1c6a25ae0063782e7.tar.xz ice-2eb88bcfdd9039a1ef9660f1c6a25ae0063782e7.zip | |
fixes
Diffstat (limited to 'java/src/IceInternal/Reference.java')
| -rw-r--r-- | java/src/IceInternal/Reference.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java index 925ca70f439..e2a0755f13a 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/IceInternal/Reference.java @@ -618,9 +618,9 @@ public final class Reference { while(true) { - Endpoint[] endpoints = null; Ice.BooleanHolder cached = new Ice.BooleanHolder(); cached.value = false; + Endpoint[] endpts = null; if(routerInfo != null) { @@ -629,23 +629,19 @@ public final class Reference // proxy endpoints. // Ice.ObjectPrx proxy = routerInfo.getClientProxy(); - endpoints = ((Ice.ObjectPrxHelper)proxy).__reference().endpoints; + endpts = ((Ice.ObjectPrxHelper)proxy).__reference().endpoints; } else if(endpoints.length > 0) { - endpoints = endpoints; + endpts = endpoints; } else if(locatorInfo != null) { - endpoints = locatorInfo.getEndpoints(this, cached); + endpts = locatorInfo.getEndpoints(this, cached); } - Endpoint[] filteredEndpoints = null; - if(endpoints != null) - { - filteredEndpoints = filterEndpoints(endpoints); - } - if(filteredEndpoints == null || filteredEndpoints.length == 0) + Endpoint[] filteredEndpts = filterEndpoints(endpts); + if(filteredEndpts == null || filteredEndpts.length == 0) { Ice.NoEndpointException e = new Ice.NoEndpointException(); e.proxy = toString(); @@ -655,7 +651,7 @@ public final class Reference try { OutgoingConnectionFactory factory = instance.outgoingConnectionFactory(); - connection = factory.create(filteredEndpoints); + connection = factory.create(filteredEndpts); assert(connection != null); } catch(Ice.LocalException ex) |