diff options
author | Marcus Arendt <[email protected]> | 2014-10-01 09:58:13 +0200 |
---|---|---|
committer | Marcus Arendt <[email protected]> | 2014-10-01 09:58:13 +0200 |
commit | 40bfc04288f623d7dbabc90f0c93c6baef997ba7 (patch) | |
tree | a2c2cdd9cd744b72679d23fb7a1cb380c29ee920 /lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java | |
parent | 0e1adc9d399f5854d5b789e5d6a32a92a6ea0d74 (diff) | |
parent | fd0b19efafcd146f96aa98fbb2c996b6e2ca9e98 (diff) | |
download | otp-40bfc04288f623d7dbabc90f0c93c6baef997ba7.tar.gz otp-40bfc04288f623d7dbabc90f0c93c6baef997ba7.tar.bz2 otp-40bfc04288f623d7dbabc90f0c93c6baef997ba7.zip |
Merge branch 'vladdu/jinterface_code_cleanup/OTP-12211' into maint
* vladdu/jinterface_code_cleanup/OTP-12211:
fix warning: Socket's InputStream not closed
silence 'potential resource leak' warnings
don't warn about some unused fields/variables
handle warnings about potential null pointers
keep all method parameters final
renamed method parameters hiding fields
add 'break' statements to make compiler happy
remove warnings from OtpMD5
rename OtpNode.flags to connFlags
rename OtpNode.Acceptor.port to acceptorPort
rename field 'self' to 'localNode'
mark deprecated unused private constructor
simplify 'if' statements
remove warnings: @Override, switch fall-through
make serialVersionUID fields private
remove unnecessary syntax (casts)
remove unused variables
removed unnecessary semicolons, imports, labels
remove unnecessary null pointer checks
remove unnecessary Cloneable and Serializable
Diffstat (limited to 'lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java')
-rw-r--r-- | lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java index 5d1d097cc8..470fdb4a14 100644 --- a/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java +++ b/lib/jinterface/test/jinterface_SUITE_data/MboxLinkUnlink.java @@ -17,7 +17,14 @@ * %CopyrightEnd% */ -import com.ericsson.otp.erlang.*; +import com.ericsson.otp.erlang.OtpErlangAtom; +import com.ericsson.otp.erlang.OtpErlangExit; +import com.ericsson.otp.erlang.OtpErlangLong; +import com.ericsson.otp.erlang.OtpErlangObject; +import com.ericsson.otp.erlang.OtpErlangPid; +import com.ericsson.otp.erlang.OtpErlangTuple; +import com.ericsson.otp.erlang.OtpMbox; +import com.ericsson.otp.erlang.OtpNode; class MboxLinkUnlink { @@ -66,7 +73,10 @@ class MboxLinkUnlink { OtpErlangObject[] msg = {mainMbox.self(),mbox.self()}; mbox.send("erl_link_server", erlNode, new OtpErlangTuple(msg)); OtpErlangObject o = mbox.receive(1000); - if (o == null) System.exit(1); + if (o == null) { + System.exit(1); + return; + } OtpErlangTuple tuple = (OtpErlangTuple)o; int tag = (int)((OtpErlangLong)tuple.elementAt(0)).longValue(); @@ -91,6 +101,7 @@ class MboxLinkUnlink { expected = tuple.elementAt(2); mbox.receive(1000); System.exit(2); + break; case erl_link_java_exit: dbg("Java got \"erl_link_java_exit\""); mbox.exit(tuple.elementAt(2)); @@ -104,6 +115,7 @@ class MboxLinkUnlink { expected = tuple.elementAt(2); mbox.receive(1000); System.exit(3); + break; case internal_link_linking_exits: dbg("Java got \"internal_link_linking_exits\""); mbox2 = node.createMbox(); @@ -113,6 +125,7 @@ class MboxLinkUnlink { expected = tuple.elementAt(2); mbox2.receive(1000); // hanging waiting for exit System.exit(4); // got someting other than exit + break; case internal_link_linked_exits: dbg("Java got \"internal_link_linked_exits\""); mbox2 = node.createMbox(); @@ -122,6 +135,7 @@ class MboxLinkUnlink { expected = tuple.elementAt(2); mbox.receive(1000); // hanging waiting for exit System.exit(5); // got someting other than exit + break; case internal_unlink_linking_exits: dbg("Java got \"internal_unlink_linking_exits\""); mbox2 = node.createMbox(); |