diff options
| author | Bernard Normier <bernard@zeroc.com> | 2008-01-09 15:36:11 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2008-01-09 15:36:11 -0500 |
| commit | 67e399b0af2fa56dcd85865e877d3ac4d8f9b45d (patch) | |
| tree | 6bdf495ed83ef7b5bff44f2df58199558aa84aa4 /java/src/Ice/ObjectAdapterI.java | |
| parent | Removed dependency on IceUtil/StringUtil.h (escapeString) (diff) | |
| parent | Fixed CHANGES bug 1619 (diff) | |
| download | ice-67e399b0af2fa56dcd85865e877d3ac4d8f9b45d.tar.bz2 ice-67e399b0af2fa56dcd85865e877d3ac4d8f9b45d.tar.xz ice-67e399b0af2fa56dcd85865e877d3ac4d8f9b45d.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'java/src/Ice/ObjectAdapterI.java')
| -rw-r--r-- | java/src/Ice/ObjectAdapterI.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 7ca631d61d5..38bcab3e208 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -680,10 +680,14 @@ public final class ObjectAdapterI implements ObjectAdapter { for(int i = 0; i < endpoints.length; ++i) { - // _routerEndpoints is sorted. - if(java.util.Collections.binarySearch(_routerEndpoints, endpoints[i]) >= 0) + java.util.Iterator p; + p = _routerEndpoints.iterator(); + while(p.hasNext()) { - return true; + if(endpoints[i].equivalent((IceInternal.EndpointI)p.next())) + { + return true; + } } } } |