aboutsummaryrefslogtreecommitdiffstats
path: root/lib/jinterface/java_src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-11-14 12:20:46 +0100
committerHenrik Nord <[email protected]>2012-11-14 12:23:30 +0100
commit15ae7c1f17f4516475e9ea60942fb60464a7e3de (patch)
tree3e3cc0599cacb832302e58d2eee8ffdbb3389e99 /lib/jinterface/java_src
parentd30cee99c662bf030ce035e56e342d7ebf155513 (diff)
parentfd2c5a8d0aeebdaf34fe920e25dd6c13ead2454a (diff)
downloadotp-15ae7c1f17f4516475e9ea60942fb60464a7e3de.tar.gz
otp-15ae7c1f17f4516475e9ea60942fb60464a7e3de.tar.bz2
otp-15ae7c1f17f4516475e9ea60942fb60464a7e3de.zip
Merge branch 'vd/jinterface_epmd_localhost'
* vd/jinterface_epmd_localhost: OtpEpmd.lokupNames() may hang if network is badly configured OTP-10579
Diffstat (limited to 'lib/jinterface/java_src')
-rw-r--r--lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
index deac528133..b985f8aa50 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
@@ -358,7 +358,7 @@ public class OtpEpmd {
}
public static String[] lookupNames() throws IOException {
- return lookupNames(InetAddress.getLocalHost());
+ return lookupNames(InetAddress.getByName(null));
}
public static String[] lookupNames(final InetAddress address)