1 files changed, 21 insertions, 1 deletions
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index 69866544132..a14f152f3e1 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -327,7 +327,27 @@ IceSSL::EndpointI::expand(bool server) const
     }
     else
     {
-        endps.push_back(const_cast<EndpointI*>(this));
+        if(!server)
+        {
+
+            vector<string> hosts = IceInternal::getHosts(_host);
+            if(hosts.size() > 1)
+            {
+                for(unsigned int i = 0; i < hosts.size(); ++i)
+                {
+                    endps.push_back(
+                        new EndpointI(_instance, hosts[i], _port, _timeout, _connectionId, _compress, true));
+                }
+            }
+            else
+            {
+                endps.push_back(const_cast<EndpointI*>(this));
+            }
+        }
+        else
+        {
+            endps.push_back(const_cast<EndpointI*>(this));
+        }
     }
     return endps;
 }