Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-07-02 00:06:45 +02:00
Code Issues Releases Wiki Activity

SMACK-405 Removed redundant code in XMPPConnection.shutdown()

Browse source 
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13687 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
Florian Schmaus 2013-06-22 17:00:53 +00:00 committed by flow
parent c7d468697f
commit 6ed6f86293
1 changed files with 8 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
source/org/jivesoftware/smack/XMPPConnection.java
View file

@ -443,48 +443,22 @@ public class XMPPConnection extends Connection {
// Ignore. // Ignore.
} }
// Set socketClosed to true. This will cause the PacketReader // Set socketClosed to true. This will cause the PacketReader
// and PacketWriter to ingore any Exceptions that are thrown // and PacketWriter to ignore any Exceptions that are thrown
// because of a read/write from/to a closed stream. // because of a read/write from/to a closed stream.
// It is *important* that this is done before socket.close()! // It is *important* that this is done before socket.close()!
socketClosed = true; socketClosed = true;
try { try {
socket.close(); socket.close();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
// In most cases the close() should be successful, so set // In most cases the close() should be successful, so set
// connected to false here. // connected to false here.
connected = false; connected = false;
// Close down the readers and writers. reader = null;
if (reader != null) { writer = null;
try {
// Should already be closed by the previous
// socket.close(). But just in case do it explicitly.
reader.close();
}
catch (Throwable ignore) { /* ignore */ }
reader = null;
}
if (writer != null) {
try {
// Should already be closed by the previous
// socket.close(). But just in case do it explicitly.
writer.close();
}
catch (Throwable ignore) { /* ignore */ }
writer = null;
}
// Make sure that the socket is really closed
try {
// Does nothing if the socket is already closed
socket.close();
}
catch (Exception e) {
// Ignore.
}
saslAuthentication.init(); saslAuthentication.init();
} }