Removed extra returns in IceDiscovery

1 files changed, 20 insertions, 24 deletions

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);
+            }
         }
     }