diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-08-14 07:19:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-08-14 07:19:13 +0200 |
| commit | b0f0bc95d4db337fa4250dd8c320d921908f55a2 (patch) | |
| tree | 477644c3b5b3822f4d12a5a269406d2928aebf2e /java/src | |
| parent | Another minor fix for Expect.py script (diff) | |
| download | ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.tar.bz2 ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.tar.xz ice-b0f0bc95d4db337fa4250dd8c320d921908f55a2.zip | |
Revert "Fixed ICE-6707 - default interface for discovery is now Ice.Default.Host if it is set"
This reverts commit 406e393f2be3a29830a7758e58e4e674afc5e21e.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java | 22 | ||||
| -rw-r--r-- | java/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java | 22 |
2 files changed, 0 insertions, 44 deletions
diff --git a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java index ced6033e0d9..0afc4d7f915 100644 --- a/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java +++ b/java/src/IceDiscovery/src/main/java/IceDiscovery/PluginI.java @@ -36,28 +36,6 @@ public class PluginI implements Ice.Plugin } int port = properties.getPropertyAsIntWithDefault("IceDiscovery.Port", 4061); String intf = properties.getProperty("IceDiscovery.Interface"); - String defaultHost = properties.getProperty("Ice.Default.Host"); - if(intf.isEmpty() && !defaultHost.isEmpty()) - { - // - // Make sure the interface is an IP address, the UDP --interface option - // doesn't support DNS names. - // - int protocol = ipv4 && !preferIPv6 ? IceInternal.Network.EnableIPv4 : IceInternal.Network.EnableIPv6; - try - { - java.net.InetSocketAddress addr = IceInternal.Network.getAddressForServer(defaultHost, 0, protocol, - preferIPv6); - if(addr != null) - { - intf = addr.getAddress().getHostAddress(); - } - } - catch(Ice.LocalException ex) - { - // Ignore - } - } if(properties.getProperty("IceDiscovery.Multicast.Endpoints").isEmpty()) { diff --git a/java/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java b/java/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java index 080329ab6fa..b19bc6d59f8 100644 --- a/java/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java +++ b/java/src/IceLocatorDiscovery/src/main/java/IceLocatorDiscovery/PluginI.java @@ -377,28 +377,6 @@ class PluginI implements Ice.Plugin } int port = properties.getPropertyAsIntWithDefault("IceLocatorDiscovery.Port", 4061); String intf = properties.getProperty("IceLocatorDiscovery.Interface"); - String defaultHost = properties.getProperty("Ice.Default.Host"); - if(intf.isEmpty() && !defaultHost.isEmpty()) - { - // - // Make sure the interface is an IP address, the UDP --interface option - // doesn't support DNS names. - // - int protocol = ipv4 && !preferIPv6 ? IceInternal.Network.EnableIPv4 : IceInternal.Network.EnableIPv6; - try - { - java.net.InetSocketAddress addr = IceInternal.Network.getAddressForServer(defaultHost, 0, protocol, - preferIPv6); - if(addr != null) - { - intf = addr.getAddress().getHostAddress(); - } - } - catch(Ice.LocalException ex) - { - // Ignore - } - } if(properties.getProperty("IceLocatorDiscovery.Reply.Endpoints").isEmpty()) { |