silence 'potential resource leak' warnings

OtpInputStream and OtoOutputStream don't need closing (they are
ByteArray*Streams)

7 files changed, 40 insertions, 0 deletions

diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
index a80d02e12c..798cd6c689 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/AbstractConnection.java
@@ -234,6 +234,7 @@ public abstract class AbstractConnection extends Thread {
 	if (!connected) {
 	    throw new IOException("Not connected");
 	}
+    @SuppressWarnings("resource")
 	final OtpOutputStream header = new OtpOutputStream(headerLen);
 
 	// preamble: 4 byte length + "passthrough" tag + version
@@ -278,6 +279,7 @@ public abstract class AbstractConnection extends Thread {
 	if (!connected) {
 	    throw new IOException("Not connected");
 	}
+    @SuppressWarnings("resource")
 	final OtpOutputStream header = new OtpOutputStream(headerLen);
 
 	// preamble: 4 byte length + "passthrough" tag + version
@@ -312,6 +314,7 @@ public abstract class AbstractConnection extends Thread {
     private void cookieError(final OtpLocalNode local,
 	    final OtpErlangAtom cookie) throws OtpAuthException {
 	try {
+        @SuppressWarnings("resource")
 	    final OtpOutputStream header = new OtpOutputStream(headerLen);
 
 	    // preamble: 4 byte length + "passthrough" tag + version
@@ -347,6 +350,7 @@ public abstract class AbstractConnection extends Thread {
 	    msg[0] = new OtpErlangAtom("$gen_cast");
 	    msg[1] = new OtpErlangTuple(msgbody);
 
+        @SuppressWarnings("resource")
 	    final OtpOutputStream payload = new OtpOutputStream(
 		    new OtpErlangTuple(msg));
 
@@ -384,6 +388,7 @@ public abstract class AbstractConnection extends Thread {
 	if (!connected) {
 	    throw new IOException("Not connected");
 	}
+    @SuppressWarnings("resource")
 	final OtpOutputStream header = new OtpOutputStream(headerLen);
 
 	// preamble: 4 byte length + "passthrough" tag
@@ -420,6 +425,7 @@ public abstract class AbstractConnection extends Thread {
 	if (!connected) {
 	    throw new IOException("Not connected");
 	}
+    @SuppressWarnings("resource")
 	final OtpOutputStream header = new OtpOutputStream(headerLen);
 
 	// preamble: 4 byte length + "passthrough" tag
@@ -468,6 +474,7 @@ public abstract class AbstractConnection extends Thread {
 	if (!connected) {
 	    throw new IOException("Not connected");
 	}
+    @SuppressWarnings("resource")
 	final OtpOutputStream header = new OtpOutputStream(headerLen);
 
 	// preamble: 4 byte length + "passthrough" tag
@@ -488,6 +495,7 @@ public abstract class AbstractConnection extends Thread {
 	do_send(header);
     }
 
+    @SuppressWarnings("resource")
     @Override
     public void run() {
 	if (!connected) {
@@ -526,6 +534,7 @@ public abstract class AbstractConnection extends Thread {
 		final byte[] tmpbuf = new byte[len];
 		// i = socket.getInputStream().read(tmpbuf);
 		readSock(socket, tmpbuf);
+        ibuf.close();
 		ibuf = new OtpInputStream(tmpbuf, flags);
 
 		if (ibuf.read1() != passThrough) {
@@ -1057,6 +1066,7 @@ public abstract class AbstractConnection extends Thread {
 
     protected void sendName(final int dist, final int aflags) throws IOException {
 
+    @SuppressWarnings("resource")
 	final OtpOutputStream obuf = new OtpOutputStream();
 	final String str = localNode.node();
 	obuf.write2BE(str.length() + 7); // 7 bytes + nodename
@@ -1076,6 +1086,7 @@ public abstract class AbstractConnection extends Thread {
     protected void sendChallenge(final int dist, final int aflags,
 	    final int challenge) throws IOException {
 
+    @SuppressWarnings("resource")
 	final OtpOutputStream obuf = new OtpOutputStream();
 	final String str = localNode.node();
 	obuf.write2BE(str.length() + 11); // 11 bytes + nodename
@@ -1101,6 +1112,7 @@ public abstract class AbstractConnection extends Thread {
 	byte[] tmpbuf;
 
 	readSock(socket, lbuf);
+    @SuppressWarnings("resource")
 	final OtpInputStream ibuf = new OtpInputStream(lbuf, 0);
 	final int len = ibuf.read2BE();
 	tmpbuf = new byte[len];
@@ -1114,6 +1126,7 @@ public abstract class AbstractConnection extends Thread {
 
 	try {
 	    final byte[] tmpbuf = read2BytePackage();
+        @SuppressWarnings("resource")
 	    final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
 	    byte[] tmpname;
 	    final int len = tmpbuf.length;
@@ -1168,6 +1181,7 @@ public abstract class AbstractConnection extends Thread {
 
 	try {
 	    final byte[] buf = read2BytePackage();
+        @SuppressWarnings("resource")
 	    final OtpInputStream ibuf = new OtpInputStream(buf, 0);
 	    peer.ntype = ibuf.read1();
 	    if (peer.ntype != AbstractNode.NTYPE_R6) {
@@ -1209,6 +1223,7 @@ public abstract class AbstractConnection extends Thread {
     protected void sendChallengeReply(final int challenge, final byte[] digest)
 	    throws IOException {
 
+    @SuppressWarnings("resource")
 	final OtpOutputStream obuf = new OtpOutputStream();
 	obuf.write2BE(21);
 	obuf.write1(ChallengeReply);
@@ -1242,6 +1257,7 @@ public abstract class AbstractConnection extends Thread {
 
 	try {
 	    final byte[] buf = read2BytePackage();
+        @SuppressWarnings("resource")
 	    final OtpInputStream ibuf = new OtpInputStream(buf, 0);
 	    final int tag = ibuf.read1();
 	    if (tag != ChallengeReply) {
@@ -1268,6 +1284,7 @@ public abstract class AbstractConnection extends Thread {
 
     protected void sendChallengeAck(final byte[] digest) throws IOException {
 
+    @SuppressWarnings("resource")
 	final OtpOutputStream obuf = new OtpOutputStream();
 	obuf.write2BE(17);
 	obuf.write1(ChallengeAck);
@@ -1287,6 +1304,7 @@ public abstract class AbstractConnection extends Thread {
 	final byte[] her_digest = new byte[16];
 	try {
 	    final byte[] buf = read2BytePackage();
+        @SuppressWarnings("resource")
 	    final OtpInputStream ibuf = new OtpInputStream(buf, 0);
 	    final int tag = ibuf.read1();
 	    if (tag != ChallengeAck) {
@@ -1312,6 +1330,7 @@ public abstract class AbstractConnection extends Thread {
 
     protected void sendStatus(final String status) throws IOException {
 
+    @SuppressWarnings("resource")
 	final OtpOutputStream obuf = new OtpOutputStream();
 	obuf.write2BE(status.length() + 1);
 	obuf.write1(ChallengeStatus);
@@ -1329,6 +1348,7 @@ public abstract class AbstractConnection extends Thread {
 
 	try {
 	    final byte[] buf = read2BytePackage();
+        @SuppressWarnings("resource")
 	    final OtpInputStream ibuf = new OtpInputStream(buf, 0);
 	    final int tag = ibuf.read1();
 	    if (tag != ChallengeStatus) {
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java
index e7a9d1092c..9ad02506fd 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpConnection.java
@@ -358,6 +358,7 @@ public class OtpConnection extends AbstractConnection {
      *                    if the connection is not active or a communication
      *                    error occurs.
      */
+    @SuppressWarnings("resource")
     public void send(final OtpErlangPid dest, final OtpErlangObject msg)
 	    throws IOException {
 	// encode and send the message
@@ -376,6 +377,7 @@ public class OtpConnection extends AbstractConnection {
      *                    if the connection is not active or a communication
      *                    error occurs.
      */
+    @SuppressWarnings("resource")
     public void send(final String dest, final OtpErlangObject msg)
 	    throws IOException {
 	// encode and send the message
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpCookedConnection.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpCookedConnection.java
index 5abf6e33f7..43b0cad222 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpCookedConnection.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpCookedConnection.java
@@ -149,6 +149,7 @@ public class OtpCookedConnection extends AbstractConnection {
     /*
      * send to pid
      */
+    @SuppressWarnings("resource")
     void send(final OtpErlangPid from, final OtpErlangPid dest,
 	    final OtpErlangObject msg) throws IOException {
 	// encode and send the message
@@ -159,6 +160,7 @@ public class OtpCookedConnection extends AbstractConnection {
      * send to remote name dest is recipient's registered name, the nodename is
      * implied by the choice of connection.
      */
+    @SuppressWarnings("resource")
     void send(final OtpErlangPid from, final String dest,
 	    final OtpErlangObject msg) throws IOException {
 	// encode and send the message
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 cf4e0ea98f..8a8ba785d9 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpEpmd.java
@@ -160,6 +160,7 @@ public class OtpEpmd {
 
 	try {
 	    s = new Socket((String) null, EpmdPort.get());
+        @SuppressWarnings("resource")
 	    final OtpOutputStream obuf = new OtpOutputStream();
 	    obuf.write2BE(node.alive().length() + 1);
 	    obuf.write1(stopReq);
@@ -189,6 +190,7 @@ public class OtpEpmd {
 	Socket s = null;
 
 	try {
+        @SuppressWarnings("resource")
 	    final OtpOutputStream obuf = new OtpOutputStream();
 	    s = new Socket(node.host(), EpmdPort.get());
 
@@ -219,6 +221,7 @@ public class OtpEpmd {
 			+ node.host() + " when looking up " + node.alive());
 	    }
 
+        @SuppressWarnings("resource")
 	    final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
 
 	    final int response = ibuf.read1();
@@ -279,6 +282,7 @@ public class OtpEpmd {
 	Socket s = null;
 
 	try {
+        @SuppressWarnings("resource")
 	    final OtpOutputStream obuf = new OtpOutputStream();
 	    s = new Socket((String) null, EpmdPort.get());
 
@@ -315,6 +319,7 @@ public class OtpEpmd {
 			+ node.host() + " when publishing " + node.alive());
 	    }
 
+        @SuppressWarnings("resource")
 	    final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
 
 	    final int response = ibuf.read1();
@@ -360,6 +365,7 @@ public class OtpEpmd {
 	Socket s = null;
 
 	try {
+        @SuppressWarnings("resource")
 	    final OtpOutputStream obuf = new OtpOutputStream();
 	    try {
 		s = new Socket(address, EpmdPort.get());
@@ -384,6 +390,7 @@ public class OtpEpmd {
 		    out.write(buffer, 0, bytesRead);
 		}
 		final byte[] tmpbuf = out.toByteArray();
+        @SuppressWarnings("resource")
 		final OtpInputStream ibuf = new OtpInputStream(tmpbuf, 0);
 		ibuf.read4BE(); // read port int
 		// final int port = ibuf.read4BE();
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
index a6e7936e78..bab0629382 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpInputStream.java
@@ -1163,6 +1163,7 @@ public class OtpInputStream extends ByteArrayInputStream {
 	    throw new OtpErlangDecodeException("Cannot read from input stream");
 	}
 
+    @SuppressWarnings("resource")
 	final OtpInputStream ois = new OtpInputStream(abuf, flags);
 	return ois.read_any();
     }
diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
index c542694550..ef60a9f38a 100644
--- a/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
+++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/OtpOutputStream.java
@@ -870,6 +870,7 @@ public class OtpOutputStream extends ByteArrayOutputStream {
      *            the compression level (<tt>0..9</tt>)
      */
     public void write_compressed(final OtpErlangObject o, int level) {
+    @SuppressWarnings("resource")
 	final OtpOutputStream oos = new OtpOutputStream(o);
 	/*
 	 * similar to erts_term_to_binary() in external.c:
@@ -923,6 +924,11 @@ public class OtpOutputStream extends ByteArrayOutputStream {
 			"Intermediate stream failed for Erlang object " + o);
 	    } finally {
 		this.fixedSize = Integer.MAX_VALUE;
+        try {
+            dos.close();
+        } catch (IOException e) {
+            // ignore
+        }
 	    }
 	}
     }
diff --git a/lib/jinterface/test/nc_SUITE_data/echo_server.java b/lib/jinterface/test/nc_SUITE_data/echo_server.java
index fc9a1a22da..0e43ea0680 100644
--- a/lib/jinterface/test/nc_SUITE_data/echo_server.java
+++ b/lib/jinterface/test/nc_SUITE_data/echo_server.java
@@ -148,11 +148,13 @@ public class echo_server {
 	    final String atomValue = ((OtpErlangAtom) t).atomValue();
 	    if (atomValue.equals("binary") && i instanceof OtpErlangBinary) {
 		final OtpErlangBinary b = (OtpErlangBinary) i;
+        @SuppressWarnings("resource")
 		final OtpInputStream bis = new OtpInputStream(b.binaryValue(),
 			0);
 		final OtpErlangObject o = bis.read_any();
 		return o;
 	    } else if (atomValue.equals("compress")) {
+        @SuppressWarnings("resource")
 		final OtpOutputStream oos = new OtpOutputStream();
 		oos.write1(OtpExternal.versionTag);
 		oos.write_compressed(i);