diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2007-12-19 22:06:38 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2007-12-19 22:06:38 +0100 |
| commit | f6121ea342641eb36f7cd67c7c877a1c70ec3055 (patch) | |
| tree | b545f3a2548b81fd8dd56a87a58f98b992c0066b /java/src/Ice/Util.java | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.tar.bz2 ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.tar.xz ice-f6121ea342641eb36f7cd67c7c877a1c70ec3055.zip | |
- 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
Diffstat (limited to 'java/src/Ice/Util.java')
| -rw-r--r-- | java/src/Ice/Util.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index bbe1df80580..ce557ccd558 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -277,7 +277,7 @@ public final class Util if(_localAddress == null) { - java.net.InetAddress addr = IceInternal.Network.getLocalAddress(); + java.net.InetAddress addr = IceInternal.Network.getLocalAddress(IceInternal.Network.EnableBoth); byte[] ip = addr.getAddress(); _localAddress = ""; |