No longer necessary to expand enpoints in proxies, use same mechanism as for multihomed hosts.

Added some missing .gitignore files.

15 files changed, 57 insertions, 23 deletions

diff --git a/java/demo/Freeze/bench/.gitignore b/java/demo/Freeze/bench/.gitignore
new file mode 100644
index 00000000000..9c39416c539
--- /dev/null
+++ b/java/demo/Freeze/bench/.gitignore
@@ -0,0 +1 @@
+db/*
diff --git a/java/demo/Freeze/library/.gitignore b/java/demo/Freeze/library/.gitignore
new file mode 100644
index 00000000000..9c39416c539
--- /dev/null
+++ b/java/demo/Freeze/library/.gitignore
@@ -0,0 +1 @@
+db/*
diff --git a/java/demo/Freeze/phonebook/.gitignore b/java/demo/Freeze/phonebook/.gitignore
new file mode 100644
index 00000000000..9c39416c539
--- /dev/null
+++ b/java/demo/Freeze/phonebook/.gitignore
@@ -0,0 +1 @@
+db/*
diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java
index 03c2bce9d87..6275105e550 100644
--- a/java/src/Ice/ObjectAdapterI.java
+++ b/java/src/Ice/ObjectAdapterI.java
@@ -1186,7 +1186,7 @@ public final class ObjectAdapterI implements ObjectAdapter
         while(p.hasNext())
         {
             IceInternal.EndpointI endp = (IceInternal.EndpointI)p.next();
-            java.util.ArrayList endps = endp.expand(false);
+            java.util.ArrayList endps = endp.expand();
             expandedEndpoints.addAll(endps);
         }
         return expandedEndpoints;
diff --git a/java/src/IceInternal/EndpointI.java b/java/src/IceInternal/EndpointI.java
index c5857e7dff7..1f398864448 100644
--- a/java/src/IceInternal/EndpointI.java
+++ b/java/src/IceInternal/EndpointI.java
@@ -112,9 +112,9 @@ abstract public class EndpointI implements Ice.Endpoint, java.lang.Comparable
 
     //
     // Expand endpoint out in to separate endpoints for each local
-    // host if endpoint was configured with no host set.
+    // host if listening on INADDR_NAY.
     //
-    public abstract java.util.ArrayList expand(boolean includeLoopback);
+    public abstract java.util.ArrayList expand();
 
     //
     // Check whether the endpoint is equivalent to a specific Connector.
diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java
index f235e382683..d767996d872 100644
--- a/java/src/IceInternal/ReferenceFactory.java
+++ b/java/src/IceInternal/ReferenceFactory.java
@@ -428,8 +428,7 @@ public final class ReferenceFactory
                 EndpointI endp = _instance.endpointFactoryManager().create(es, false);
                 if(endp != null)
                 {
-                    java.util.ArrayList endps = endp.expand(true);
-                    endpoints.addAll(endps);
+                    endpoints.add(endp);
                 }
                 else
                 {
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java
index 71a20e4f37a..2635d9ad881 100644
--- a/java/src/IceInternal/TcpConnector.java
+++ b/java/src/IceInternal/TcpConnector.java
@@ -57,7 +57,15 @@ final class TcpConnector implements Connector, java.lang.Comparable
     public final boolean
     equivalent(String host, int port)
     {
-        java.net.InetSocketAddress addr = Network.getAddress(host, port);
+        java.net.InetSocketAddress addr;
+        try
+        {
+            addr = Network.getAddress(host, port);
+        }
+        catch(Ice.DNSException ex)
+        {
+            return false;
+        }
         return addr.equals(_addr);
     }
 
diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index bc7a3b46a79..941b1ee0cc3 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -362,10 +362,10 @@ final class TcpEndpointI extends EndpointI
 
     //
     // Expand endpoint out in to separate endpoints for each local
-    // host if endpoint was configured with no host set. 
+    // host if listening on INADDR_ANY.
     //
     public java.util.ArrayList
-    expand(boolean includeLoopback)
+    expand()
     {
         java.util.ArrayList endps = new java.util.ArrayList();
         if(_host.equals("0.0.0.0"))
@@ -375,7 +375,7 @@ final class TcpEndpointI extends EndpointI
             while(iter.hasNext())
             {
                 String host = (String)iter.next();
-                if(includeLoopback || hosts.size() == 1 || !host.equals("127.0.0.1"))
+                if(hosts.size() == 1 || !host.equals("127.0.0.1"))
                 {
                     endps.add(new TcpEndpointI(_instance, host, _port, _timeout, _connectionId, _compress));
                 }
diff --git a/java/src/IceInternal/UdpConnector.java b/java/src/IceInternal/UdpConnector.java
index 790d76dd94e..e3c49b6955b 100644
--- a/java/src/IceInternal/UdpConnector.java
+++ b/java/src/IceInternal/UdpConnector.java
@@ -40,7 +40,15 @@ final class UdpConnector implements Connector, java.lang.Comparable
     final public boolean
     equivalent(String host, int port)
     {
-        java.net.InetSocketAddress addr = Network.getAddress(host, port);
+        java.net.InetSocketAddress addr; 
+        try
+        {
+            addr = Network.getAddress(host, port);
+        }
+        catch(Ice.DNSException ex)
+        {
+            return false;
+        }
         return addr.equals(_addr);
     }
 
diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/IceInternal/UdpEndpointI.java
index 976824b93d7..fc00be54842 100644
--- a/java/src/IceInternal/UdpEndpointI.java
+++ b/java/src/IceInternal/UdpEndpointI.java
@@ -528,10 +528,10 @@ final class UdpEndpointI extends EndpointI
 
     //
     // Expand endpoint out in to separate endpoints for each local
-    // host if endpoint was configured with no host set. 
+    // host if listening on INADDR_ANY.
     //
     public java.util.ArrayList
-    expand(boolean includeLoopback)
+    expand()
     {
         java.util.ArrayList endps = new java.util.ArrayList();
         if(_host.equals("0.0.0.0"))
@@ -541,7 +541,7 @@ final class UdpEndpointI extends EndpointI
             while(iter.hasNext())
             {
                 String host = (String)iter.next();
-                if(includeLoopback || hosts.size() == 1 || !host.equals("127.0.0.1"))
+                if(hosts.size() == 1 || !host.equals("127.0.0.1"))
                 {
                     endps.add(new UdpEndpointI(_instance, host, _port, _mcastInterface, _mcastTtl,  _connect,
                                                _connectionId, _compress));
diff --git a/java/src/IceInternal/UnknownEndpointI.java b/java/src/IceInternal/UnknownEndpointI.java
index 75bffdd3163..226fe8f4bd0 100644
--- a/java/src/IceInternal/UnknownEndpointI.java
+++ b/java/src/IceInternal/UnknownEndpointI.java
@@ -260,10 +260,10 @@ final class UnknownEndpointI extends EndpointI
 
     //
     // Expand endpoint out in to separate endpoints for each local
-    // host if endpoint was configured with no host set.
+    // host if listening on INADDR_ANY.
     //
     public java.util.ArrayList
-    expand(boolean includeLoopback)
+    expand()
     {
         java.util.ArrayList endps = new java.util.ArrayList();
         endps.add(this);
diff --git a/java/ssl/jdk1.4/IceSSL/ConnectorI.java b/java/ssl/jdk1.4/IceSSL/ConnectorI.java
index f56150445e6..004bf95cdc6 100644
--- a/java/ssl/jdk1.4/IceSSL/ConnectorI.java
+++ b/java/ssl/jdk1.4/IceSSL/ConnectorI.java
@@ -248,7 +248,15 @@ final class ConnectorI implements IceInternal.Connector, java.lang.Comparable
     final boolean
     equivalent(String host, int port)
     {
-        java.net.InetSocketAddress addr = IceInternal.Network.getAddress(host, port);
+        java.net.InetSocketAddress addr;
+        try
+        {
+            addr = IceInternal.Network.getAddress(host, port);
+        }
+        catch(Ice.DNSException ex)
+        {
+            return false;
+        }
         return addr.equals(_addr);
     }
 
diff --git a/java/ssl/jdk1.4/IceSSL/EndpointI.java b/java/ssl/jdk1.4/IceSSL/EndpointI.java
index e5dfaf1073d..0f295b420b1 100644
--- a/java/ssl/jdk1.4/IceSSL/EndpointI.java
+++ b/java/ssl/jdk1.4/IceSSL/EndpointI.java
@@ -362,10 +362,10 @@ final class EndpointI extends IceInternal.EndpointI
 
     //
     // Expand endpoint out in to separate endpoints for each local
-    // host if endpoint was configured with no host set.
+    // host if listening on INADDR_ANY.
     //
     public java.util.ArrayList
-    expand(boolean includeLoopback)
+    expand()
     {
         java.util.ArrayList endps = new java.util.ArrayList();
         if(_host.equals("0.0.0.0"))
@@ -375,7 +375,7 @@ final class EndpointI extends IceInternal.EndpointI
             while(iter.hasNext())
             {
                 String host = (String)iter.next();
-                if(includeLoopback || hosts.size() == 1 || !host.equals("127.0.0.1"))
+                if(hosts.size() == 1 || !host.equals("127.0.0.1"))
                 {
                     endps.add(new EndpointI(_instance, host, _port, _timeout, _connectionId, _compress));
                                         
diff --git a/java/ssl/jdk1.5/IceSSL/ConnectorI.java b/java/ssl/jdk1.5/IceSSL/ConnectorI.java
index 502f5cba419..9836a78753a 100644
--- a/java/ssl/jdk1.5/IceSSL/ConnectorI.java
+++ b/java/ssl/jdk1.5/IceSSL/ConnectorI.java
@@ -119,7 +119,15 @@ final class ConnectorI implements IceInternal.Connector, java.lang.Comparable
     final boolean
     equivalent(String host, int port)
     {
-        java.net.InetSocketAddress addr = IceInternal.Network.getAddress(host, port);
+        java.net.InetSocketAddress addr; 
+        try
+        {
+            addr = IceInternal.Network.getAddress(host, port);
+        }
+        catch(Ice.DNSException ex)
+        {
+            return false;
+        }
         return addr.equals(_addr);
     }
 
diff --git a/java/ssl/jdk1.5/IceSSL/EndpointI.java b/java/ssl/jdk1.5/IceSSL/EndpointI.java
index 4af762a069d..8cf0f559fa4 100644
--- a/java/ssl/jdk1.5/IceSSL/EndpointI.java
+++ b/java/ssl/jdk1.5/IceSSL/EndpointI.java
@@ -362,10 +362,10 @@ final class EndpointI extends IceInternal.EndpointI
 
     //
     // Expand endpoint out in to separate endpoints for each local
-    // host if endpoint was configured with no host set.
+    // host if listening on INADDR_ANY.
     //
     public java.util.ArrayList
-    expand(boolean includeLoopback)
+    expand()
     {
         java.util.ArrayList endps = new java.util.ArrayList();
         if(_host.equals("0.0.0.0"))
@@ -375,7 +375,7 @@ final class EndpointI extends IceInternal.EndpointI
             while(iter.hasNext())
             {
                 String host = (String)iter.next();
-                if(includeLoopback || hosts.size() == 1 || !host.equals("127.0.0.1"))
+                if(hosts.size() == 1 || !host.equals("127.0.0.1"))
                 {
                     endps.add(new EndpointI(_instance, host, _port, _timeout, _connectionId, _compress));