diff options
| author | Marcus Arendt <[email protected]> | 2014-10-01 09:58:05 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-10-01 09:58:05 +0200 |
| commit | 0e1adc9d399f5854d5b789e5d6a32a92a6ea0d74 (patch) | |
| tree | 22a49de1c2e01feb7914e1d06cd24d63a1a63dad /lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractNode.java | |
| parent | 88d5c0edbd08e069bc20cf13fa90bca59eb43e86 (diff) | |
| parent | b64eb80453cdaac936eba1e46f814f4e8b92f65b (diff) | |
| download | otp-0e1adc9d399f5854d5b789e5d6a32a92a6ea0d74.tar.gz otp-0e1adc9d399f5854d5b789e5d6a32a92a6ea0d74.tar.bz2 otp-0e1adc9d399f5854d5b789e5d6a32a92a6ea0d74.zip | |
Merge branch 'vladdu/jinterface_findbugs/OTP-12210' into maint
* vladdu/jinterface_findbugs/OTP-12210:
OtpErlangList.clone must not return null
handle empty .erlang.cookie without crashing
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 | 7 |
1 files changed, 6 insertions, 1 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..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 { |