vanitasvitae/Smack
1
0
Fork 0
mirror of https://github.com/vanitasvitae/Smack.git synced 2025-09-09 17:19:39 +02:00
Code Issues Releases Wiki Activity

Improve handling of InterruptedException

Browse source 
InterruptedExceptions should be treated as the users intention to
'cancel' the current thread's task. There is no such thing as a
spurious interrupt (not to be confused with "spurious wakeups").
This commit is contained in:
Florian Schmaus 2015-01-16 15:55:06 +01:00
parent 14b03149db
commit d099e7b16d
5 changed files with 15 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

11
smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java
View file

@ -1216,9 +1216,11 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
catch (InterruptedException e) {
throwNotConnectedExceptionIfDoneAndResumptionNotPossible();
// If the method above did not throw, we have a spurious interrupt and we should try to enqueue the
// element again
LOGGER.log(Level.FINE, "Spurious interrupt", e);
// If the method above did not throw, then the sending thread was interrupted
// TODO in a later version of Smack the InterruptedException should be thrown to
// allow users to interrupt a sending thread that is currently blocking because
// the queue is full.
LOGGER.log(Level.WARNING, "Sending thread was interrupted", e);
}
}
}
@ -1253,7 +1255,8 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
}
catch (InterruptedException e) {
if (!queue.isShutdown()) {
LOGGER.log(Level.FINER, "Spurious interrupt", e);
// Users shouldn't try to interrupt the packet writer thread
LOGGER.log(Level.WARNING, "Packet writer thread was interrupted. Don't do that. Use disconnect() instead.", e);
}
}
return packet;