Swift
summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorGurmeen Bindra <gurmeen.bindra@isode.com>2012-08-16 15:59:36 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-08-20 10:27:22 (GMT)
commitef3a184261c2df7bcf5c8ab155915cf2521e04f1 (patch)
treef5590233fa5fa405136c1e19e8578d5f77211efa /src/com
parenta22d6c1c23f06bb4dbc8b5c72177ebf27b239482 (diff)
downloadstroke-ef3a184261c2df7bcf5c8ab155915cf2521e04f1.zip
stroke-ef3a184261c2df7bcf5c8ab155915cf2521e04f1.tar.bz2
Close socketChannel in finally block
In one of my testing scenario, socket was not getting closed. This was happening when an XMPP client was connecting to a domain which was different from the domain in the jabber ID of the connection user. Moving the close call to a finally block ensures that socket gets closed in all scenarios. Test-information: I created an IM domain j.com on my XMPP Server and then added a user with that domain (user@j.com). Then I tried connecting to my Primary domain using this new user. After removing j.com, I could an increase in number of sockets after every poll (coreclient.connect()) but not after this patch.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/isode/stroke/network/JavaConnection.java154
1 files changed, 79 insertions, 75 deletions
diff --git a/src/com/isode/stroke/network/JavaConnection.java b/src/com/isode/stroke/network/JavaConnection.java
index 07e702e..7814f71 100644
--- a/src/com/isode/stroke/network/JavaConnection.java
+++ b/src/com/isode/stroke/network/JavaConnection.java
@@ -35,90 +35,94 @@ public class JavaConnection extends Connection implements EventOwner {
public void run() {
try {
- socketChannel_ = SocketChannel.open(
- new InetSocketAddress(address_.getAddress().getInetAddress(),address_.getPort()));
-
- /* By default, SocketChannels start off in blocking mode, which
- * isn't what we want
- */
- socketChannel_.configureBlocking(false);
- } catch (IOException ex) {
- handleConnected(true);
- return;
- }
- handleConnected(false);
- while (!disconnecting_) {
- while (!writeBuffer_.isEmpty()) {
- ByteArray data = writeBuffer_.get(0);
- ByteBuffer byteBuffer = ByteBuffer.wrap(data.getData());
- try {
- /* Because the SocketChannel is non-blocking, we have to
- * be prepared to cope with the write operation not
- * consuming all of the data
- */
- boolean finishedWriting = false;
- while (!finishedWriting && !disconnecting_) {
- socketChannel_.write(byteBuffer);
- finishedWriting = (byteBuffer.remaining() == 0);
- if (!finishedWriting) {
- try {
- /* Give the output buffer a chance to empty */
- Thread.sleep(100);
- }
- catch (InterruptedException e) {
- /* Perhaps someone has set disconnecting_ */
+ try {
+ socketChannel_ = SocketChannel.open(
+ new InetSocketAddress(address_.getAddress().getInetAddress(),address_.getPort()));
+ /* By default, SocketChannels start off in blocking mode, which
+ * isn't what we want
+ */
+ socketChannel_.configureBlocking(false);
+ } catch (IOException ex) {
+ handleConnected(true);
+ return;
+ }
+ handleConnected(false);
+ while (!disconnecting_) {
+ while (!writeBuffer_.isEmpty()) {
+ ByteArray data = writeBuffer_.get(0);
+ ByteBuffer byteBuffer = ByteBuffer.wrap(data.getData());
+ try {
+ /* Because the SocketChannel is non-blocking, we have to
+ * be prepared to cope with the write operation not
+ * consuming all of the data
+ */
+ boolean finishedWriting = false;
+ while (!finishedWriting && !disconnecting_) {
+ socketChannel_.write(byteBuffer);
+ finishedWriting = (byteBuffer.remaining() == 0);
+ if (!finishedWriting) {
+ try {
+ /* Give the output buffer a chance to empty */
+ Thread.sleep(100);
+ }
+ catch (InterruptedException e) {
+ /* Perhaps someone has set disconnecting_ */
+ }
}
}
+ } catch (IOException ex) {
+ disconnecting_ = true;
+ handleDisconnected(Error.WriteError);
}
- } catch (IOException ex) {
- disconnecting_ = true;
- handleDisconnected(Error.WriteError);
+ writeBuffer_.remove(0);
}
- writeBuffer_.remove(0);
- }
- ByteArray data = new ByteArray();
- try {
- ByteBuffer byteBuffer = ByteBuffer.allocate(1024);
-
- int count = socketChannel_.read(byteBuffer);
- while (count > 0) {
- byteBuffer.flip();
- byte[] result = new byte[byteBuffer.remaining()];
- byteBuffer.get(result);
- byteBuffer.compact();
- for (int i=0; i<result.length; i++) {
- data.append(result[i]);
+ ByteArray data = new ByteArray();
+ try {
+ ByteBuffer byteBuffer = ByteBuffer.allocate(1024);
+
+ int count = socketChannel_.read(byteBuffer);
+ while (count > 0) {
+ byteBuffer.flip();
+ byte[] result = new byte[byteBuffer.remaining()];
+ byteBuffer.get(result);
+ byteBuffer.compact();
+ for (int i=0; i<result.length; i++) {
+ data.append(result[i]);
+ }
+ count = socketChannel_.read(byteBuffer);
}
- count = socketChannel_.read(byteBuffer);
- }
- if (count == -1) {
- /* socketChannel input has reached "end-of-stream", which
- * we regard as meaning that the socket has been closed
- */
- throw new IOException("socketChannel_.read returned -1");
- }
- } catch (IOException ex) {
- handleDisconnected(Error.ReadError);
- return;
- }
-
- if (!data.isEmpty()) {
- handleDataRead(data);
- }
+ if (count == -1) {
+ /* socketChannel input has reached "end-of-stream", which
+ * we regard as meaning that the socket has been closed
+ */
+ throw new IOException("socketChannel_.read returned -1");
+ }
+ } catch (IOException ex) {
+ handleDisconnected(Error.ReadError);
+ return;
+ }
- try {
- Thread.sleep(100);
- } catch (InterruptedException ex) {
- /* We've been woken up, probably to force us to do something.*/
+ if (!data.isEmpty()) {
+ handleDataRead(data);
+ }
+
+ try {
+ Thread.sleep(100);
+ } catch (InterruptedException ex) {
+ /* We've been woken up, probably to force us to do something.*/
+ }
+ }
+ handleDisconnected(null);
+ }finally {
+ if(socketChannel_ != null) {
+ try {
+ socketChannel_.close();
+ } catch (IOException ex) {
+ /* Do we need to return an error if we're already trying to close? */
+ }
}
}
- try {
- socketChannel_.close();
- } catch (IOException ex) {
- /* Do we need to return an error if we're already trying to close? */
- }
- handleDisconnected(null);
}
private void handleConnected(final boolean error) {