diff options
| author | Bernard Normier <bernard@zeroc.com> | 2017-06-27 14:54:23 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2017-06-27 14:54:23 -0400 |
| commit | 0608ce46dff9a05f191895b102b577e1169e76c3 (patch) | |
| tree | 0e4d052bd8a58a11db5f82c511b3964d01b31479 /java | |
| parent | Fixed proxy comparison in map (C++11 mapping) (diff) | |
| download | ice-0608ce46dff9a05f191895b102b577e1169e76c3.tar.bz2 ice-0608ce46dff9a05f191895b102b577e1169e76c3.tar.xz ice-0608ce46dff9a05f191895b102b577e1169e76c3.zip | |
Removed extra returns in IceDiscovery
Diffstat (limited to 'java')
| -rw-r--r-- | java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java | 44 |
1 files changed, 20 insertions, 24 deletions
diff --git a/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java b/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java index e46d01ffdcf..3fe15207dc6 100644 --- a/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java +++ b/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java @@ -140,25 +140,25 @@ class LookupI implements Lookup if(proxy != null || _proxies.isEmpty()) { sendResponse(proxy); - return; } else if(_proxies.size() == 1) { sendResponse(_proxies.toArray(new com.zeroc.Ice.ObjectPrx[1])[0]); - return; } - - List<com.zeroc.Ice.Endpoint> endpoints = new ArrayList<>(); - com.zeroc.Ice.ObjectPrx result = null; - for(com.zeroc.Ice.ObjectPrx prx : _proxies) + else { - if(result == null) + List<com.zeroc.Ice.Endpoint> endpoints = new ArrayList<>(); + com.zeroc.Ice.ObjectPrx result = null; + for(com.zeroc.Ice.ObjectPrx prx : _proxies) { - result = prx; + if(result == null) + { + result = prx; + } + endpoints.addAll(java.util.Arrays.asList(prx.ice_getEndpoints())); } - endpoints.addAll(java.util.Arrays.asList(prx.ice_getEndpoints())); + sendResponse(result.ice_endpoints(endpoints.toArray(new com.zeroc.Ice.Endpoint[endpoints.size()]))); } - sendResponse(result.ice_endpoints(endpoints.toArray(new com.zeroc.Ice.Endpoint[endpoints.size()]))); } @Override @@ -391,29 +391,25 @@ class LookupI implements Lookup synchronized void foundObject(com.zeroc.Ice.Identity id, String requestId, com.zeroc.Ice.ObjectPrx proxy) { ObjectRequest request = _objectRequests.get(id); - if(request == null || !request.getRequestId().equals(requestId)) // Ignore responses from old requests + if(request != null && request.getRequestId().equals(requestId)) // Ignore responses from old requests { - return; + request.response(proxy); + request.cancelTimer(); + _objectRequests.remove(id); } - - request.response(proxy); - request.cancelTimer(); - _objectRequests.remove(id); } synchronized void foundAdapter(String adapterId, String requestId, com.zeroc.Ice.ObjectPrx proxy, boolean isReplicaGroup) { AdapterRequest request = _adapterRequests.get(adapterId); - if(request == null || !request.getRequestId().equals(requestId)) // Ignore responses from old requests + if(request != null && request.getRequestId().equals(requestId)) // Ignore responses from old requests { - return; - } - - if(request.response(proxy, isReplicaGroup)) - { - request.cancelTimer(); - _adapterRequests.remove(adapterId); + if(request.response(proxy, isReplicaGroup)) + { + request.cancelTimer(); + _adapterRequests.remove(adapterId); + } } } |