- Merge IPv6 support from Dwayne's branch.

- Reviewed and fixed IPv6 bugs.
- Fixed bug in the outgoing connection factory where an assert could be
  triggered if the proxy contained identical endpoints

1 files changed, 2 insertions, 2 deletions

diff --git a/java/src/IceInternal/UdpEndpointFactory.java b/java/src/IceInternal/UdpEndpointFactory.java
index 767f803b17c..76a98188408 100644
--- a/java/src/IceInternal/UdpEndpointFactory.java
+++ b/java/src/IceInternal/UdpEndpointFactory.java
@@ -29,9 +29,9 @@ final class UdpEndpointFactory implements EndpointFactory
     }
 
     public EndpointI
-    create(String str, boolean server)
+    create(String str, boolean oaEndpoint)
     {
-        return new UdpEndpointI(_instance, str, server);
+        return new UdpEndpointI(_instance, str, oaEndpoint);
     }
 
     public EndpointI