Bug 1996 - multihomed hostnames

1 files changed, 23 insertions, 2 deletions

diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index 21eb90d067c..e83c38ac416 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -388,8 +388,29 @@ final class TcpEndpointI extends EndpointI
         }
         else
         {
-            calcHashValue();
-            endps.add(this);
+            if(!server)
+            {
+                java.util.ArrayList hosts = Network.getHosts(_host);
+                if(hosts.size() > 1)
+                {
+                    java.util.Iterator iter = hosts.iterator();
+                    while(iter.hasNext())
+                    {
+                        String host = (String)iter.next();
+                        endps.add(new TcpEndpointI(_instance, host, _port, _timeout, _connectionId, _compress, true));
+                    }
+                }
+                else
+                {
+                    calcHashValue();
+                    endps.add(this);
+                }
+            }
+            else
+            {
+                calcHashValue();
+                endps.add(this);
+            }
         }
         return endps;
     }