From 4a9634d1676f7a7075af399e77432e7069d7ac26 Mon Sep 17 00:00:00 2001 From: Vlad Dumitrescu Date: Wed, 10 Sep 2014 10:26:42 +0200 Subject: simplify 'if' statements --- lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java') diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java index 3ef44b8851..51a0b8ad5d 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java @@ -260,8 +260,7 @@ public class AbstractNode { final String drive = System.getenv("HOMEDRIVE"); final String path = System.getenv("HOMEPATH"); return (drive != null && path != null) ? drive + path : home; - } else { - return home; } + return home; } } -- cgit v1.2.3 From 457019ac679bb555239c4749da197205857d9f9f Mon Sep 17 00:00:00 2001 From: Vlad Dumitrescu Date: Fri, 12 Sep 2014 12:16:45 +0200 Subject: handle empty .erlang.cookie without crashing --- lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java') diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java index 3ef44b8851..3c15978b52 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java @@ -128,7 +128,12 @@ public class AbstractNode { final File dotCookieFile = new File(dotCookieFilename); br = new BufferedReader(new FileReader(dotCookieFile)); - defaultCookie = br.readLine().trim(); + final String line = br.readLine(); + if (line == null) { + defaultCookie = ""; + } else { + defaultCookie = line.trim(); + } } catch (final IOException e) { defaultCookie = ""; } finally { -- cgit v1.2.3