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

Use try-with-resources where possible

Browse source 
and make StanzaCollector implement AutoCloseable.
This commit is contained in:
Florian Schmaus 2019-02-04 09:36:37 +01:00
parent e98d42790a
commit 658fd08d20
10 changed files with 30 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
smack-experimental/src/main/java/org/jivesoftware/smackx/iot/data/IoTDataManager.java
View file

@ -192,9 +192,9 @@ public final class IoTDataManager extends IoTManager {
doneCollector.nextResult();
}
finally {
// Ensure that the two collectors are canceled in any case.
// Canceling dataCollector will also cancel the doneCollector since it is configured as dataCollector's
// collector to reset.
dataCollector.cancel();
doneCollector.cancel();
}
int collectedCount = dataCollector.getCollectedCount();

10
smack-experimental/src/main/java/org/jivesoftware/smackx/mam/MamManager.java
View file

@ -546,17 +546,15 @@ public final class MamManager extends Manager {
StanzaCollector.Configuration resultCollectorConfiguration = StanzaCollector.newConfiguration()
.setStanzaFilter(new MamResultFilter(mamQueryIq)).setCollectorToReset(mamFinIQCollector);
StanzaCollector resultCollector = connection.createStanzaCollector(resultCollectorConfiguration);
try {
StanzaCollector cancelledResultCollector;
try (StanzaCollector resultCollector = connection.createStanzaCollector(resultCollectorConfiguration)) {
connection.sendStanza(mamQueryIq);
mamFinIQ = mamFinIQCollector.nextResultOrThrow();
} finally {
mamFinIQCollector.cancel();
resultCollector.cancel();
cancelledResultCollector = resultCollector;
}
return new MamQueryPage(resultCollector, mamFinIQ);
return new MamQueryPage(cancelledResultCollector, mamFinIQ);
}
/**