mirror of
https://codeberg.org/Mercury-IM/Smack
synced 2024-11-07 16:55:58 +01:00
SMACK-405 Removed redundant code in XMPPConnection.shutdown()
git-svn-id: http://svn.igniterealtime.org/svn/repos/smack/trunk@13687 b35dd754-fafc-0310-a699-88a17e54d16e
This commit is contained in:
parent
c7d468697f
commit
6ed6f86293
1 changed files with 8 additions and 34 deletions
|
@ -443,48 +443,22 @@ public class XMPPConnection extends Connection {
|
|||
// Ignore.
|
||||
}
|
||||
|
||||
// Set socketClosed to true. This will cause the PacketReader
|
||||
// and PacketWriter to ingore any Exceptions that are thrown
|
||||
// because of a read/write from/to a closed stream.
|
||||
// It is *important* that this is done before socket.close()!
|
||||
// Set socketClosed to true. This will cause the PacketReader
|
||||
// and PacketWriter to ignore any Exceptions that are thrown
|
||||
// because of a read/write from/to a closed stream.
|
||||
// It is *important* that this is done before socket.close()!
|
||||
socketClosed = true;
|
||||
try {
|
||||
socket.close();
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
// In most cases the close() should be successful, so set
|
||||
// connected to false here.
|
||||
// In most cases the close() should be successful, so set
|
||||
// connected to false here.
|
||||
connected = false;
|
||||
|
||||
// Close down the readers and writers.
|
||||
if (reader != 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.
|
||||
}
|
||||
reader = null;
|
||||
writer = null;
|
||||
|
||||
saslAuthentication.init();
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue