Removed extra returns in IceDiscovery

3 files changed, 61 insertions, 73 deletions

diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp
index 6ffb3d94764..5f1c0285949 100644
--- a/cpp/src/IceDiscovery/LookupI.cpp
+++ b/cpp/src/IceDiscovery/LookupI.cpp
@@ -163,26 +163,26 @@ AdapterRequest::finished(const ObjectPrxPtr& proxy)
     if(proxy || _proxies.empty())
     {
         RequestT<string, AdapterCB>::finished(proxy);
-        return;
     }
     else if(_proxies.size() == 1)
     {
         RequestT<string, AdapterCB>::finished(*_proxies.begin());
-        return;
     }
-
-    EndpointSeq endpoints;
-    ObjectPrxPtr prx;
-    for(set<ObjectPrxPtr>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
+    else
     {
-        if(!prx)
+        EndpointSeq endpoints;
+        ObjectPrxPtr prx;
+        for(set<ObjectPrxPtr>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
         {
-            prx = *p;
+            if(!prx)
+            {
+                prx = *p;
+            }
+            Ice::EndpointSeq endpts = (*p)->ice_getEndpoints();
+            copy(endpts.begin(), endpts.end(), back_inserter(endpoints));
         }
-        Ice::EndpointSeq endpts = (*p)->ice_getEndpoints();
-        copy(endpts.begin(), endpts.end(), back_inserter(endpoints));
+        RequestT<string, AdapterCB>::finished(prx->ice_endpoints(endpoints));
     }
-    RequestT<string, AdapterCB>::finished(prx->ice_endpoints(endpoints));
 }
 
 void
@@ -453,14 +453,12 @@ LookupI::foundObject(const Ice::Identity& id, const string& requestId, const Ice
 {
     Lock sync(*this);
     map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
-    if(p == _objectRequests.end() || p->second->getRequestId() != requestId) // Ignore responses from old requests
+    if(p != _objectRequests.end() && p->second->getRequestId() == requestId) // Ignore responses from old requests
     {
-        return;
+        p->second->response(proxy);
+        _timer->cancel(p->second);
+        _objectRequests.erase(p);
     }
-
-    p->second->response(proxy);
-    _timer->cancel(p->second);
-    _objectRequests.erase(p);
 }
 
 void
@@ -469,15 +467,13 @@ LookupI::foundAdapter(const string& adapterId, const string& requestId, const Ic
 {
     Lock sync(*this);
     map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(adapterId);
-    if(p == _adapterRequests.end() || p->second->getRequestId() != requestId) // Ignore responses from old requests
+    if(p != _adapterRequests.end() && p->second->getRequestId() == requestId) // Ignore responses from old requests
     {
-        return;
-    }
-
-    if(p->second->response(proxy, isReplicaGroup))
-    {
-        _timer->cancel(p->second);
-        _adapterRequests.erase(p);
+        if(p->second->response(proxy, isReplicaGroup))
+        {
+            _timer->cancel(p->second);
+            _adapterRequests.erase(p);
+        }
     }
 }
 
diff --git a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java
index 4c533d4d869..9d3277bcca5 100644
--- a/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java
+++ b/java-compat/src/IceDiscovery/src/main/java/IceDiscovery/LookupI.java
@@ -150,25 +150,25 @@ class LookupI extends _LookupDisp
             if(proxy != null || _proxies.isEmpty())
             {
                 sendResponse(proxy);
-                return;
             }
             else if(_proxies.size() == 1)
             {
                 sendResponse(_proxies.toArray(new Ice.ObjectPrx[1])[0]);
-                return;
             }
-
-            List<Ice.Endpoint> endpoints = new ArrayList<Ice.Endpoint>();
-            Ice.ObjectPrx result = null;
-            for(Ice.ObjectPrx prx : _proxies)
+            else
             {
-                if(result == null)
+                List<Ice.Endpoint> endpoints = new ArrayList<Ice.Endpoint>();
+                Ice.ObjectPrx result = null;
+                for(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 Ice.Endpoint[endpoints.size()])));
             }
-            sendResponse(result.ice_endpoints(endpoints.toArray(new Ice.Endpoint[endpoints.size()])));
         }
 
         @Override
@@ -435,29 +435,25 @@ class LookupI extends _LookupDisp
     foundObject(Ice.Identity id, String requestId, 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, 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);
+            }
         }
     }
 
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);
+            }
         }
     }