Mercury-IM/Smack
Mercury-IM/Smack
1
0
Fork 0
mirror of https://codeberg.org/Mercury-IM/Smack synced 2024-11-22 06:12:05 +01:00
Code Issues Releases Wiki Activity

Make sure StanzaCollector is cancelled

Browse source 
even if nextResult(long) throws an InterruptedException when called in
nextResultOrThrow(long).
This commit is contained in:
Florian Schmaus 2018-10-22 11:34:49 +02:00
parent 06956a36b9
commit 367580d37b
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
smack-core/src/main/java/org/jivesoftware/smack/StanzaCollector.java
View file

@ -256,8 +256,12 @@ public class StanzaCollector {
*/ */
public <P extends Stanza> P nextResultOrThrow(long timeout) throws NoResponseException, public <P extends Stanza> P nextResultOrThrow(long timeout) throws NoResponseException,
XMPPErrorException, InterruptedException, NotConnectedException { XMPPErrorException, InterruptedException, NotConnectedException {
P result = nextResult(timeout); P result;
cancel(); try {
result = nextResult(timeout);
} finally {
cancel();
}
if (result == null) { if (result == null) {
if (!connection.isConnected()) { if (!connection.isConnected()) {
throw new NotConnectedException(connection, packetFilter); throw new NotConnectedException(connection, packetFilter);