diff options
| author | Marcus Arendt <[email protected]> | 2014-10-01 09:58:31 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-10-01 09:58:31 +0200 |
| commit | c3124a7b4ce03e181f2c57ac727dfd854fd32d80 (patch) | |
| tree | e2c3993c8189bf5bc467907c129925b800f9ba30 /lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java | |
| parent | 6cfa8feeca6d01d230f1837a01b1f0ae706da457 (diff) | |
| parent | 40bfc04288f623d7dbabc90f0c93c6baef997ba7 (diff) | |
| download | otp-c3124a7b4ce03e181f2c57ac727dfd854fd32d80.tar.gz otp-c3124a7b4ce03e181f2c57ac727dfd854fd32d80.tar.bz2 otp-c3124a7b4ce03e181f2c57ac727dfd854fd32d80.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java')
| -rw-r--r-- | lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java | 10 |
1 files changed, 7 insertions, 3 deletions
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..3bb1bbbd18 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 { @@ -260,8 +265,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; } } |