diff options
author | Markus Alexander Kuppe | 2013-10-15 16:26:32 +0000 |
---|---|---|
committer | Markus Alexander Kuppe | 2013-10-15 16:26:32 +0000 |
commit | 8669d5aa697a0ded793d1411d079db9d3243e0c5 (patch) | |
tree | bc61ce6c0af7a7a3b211e0d62175323e3f426a82 /protocols | |
parent | 18d9ddae5a8f6ca77038e71b4399c19ad20c5683 (diff) | |
download | org.eclipse.ecf-8669d5aa697a0ded793d1411d079db9d3243e0c5.tar.gz org.eclipse.ecf-8669d5aa697a0ded793d1411d079db9d3243e0c5.tar.xz org.eclipse.ecf-8669d5aa697a0ded793d1411d079db9d3243e0c5.zip |
Backport Memleak fix described in [1] and outlined in [2]. The 3.3.0R-Release_HEAD-sdk_feature-120_2013-10-16_15-25-33
Smask CQ #7367 [3] has been updated to indicate that we backported this
fix.
[1] http://issues.igniterealtime.org/browse/SMACK-441
[2]
http://fisheye.igniterealtime.org/viewrep/smack/branches/smack_3_3_1/source/org/jivesoftware/smack/keepalive/KeepAliveManager.java?r1=13657&r2=13703
[3] https://dev.eclipse.org/ipzilla/show_bug.cgi?id=7367
Diffstat (limited to 'protocols')
-rw-r--r-- | protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java index dea49b80f..5246896fc 100644 --- a/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java +++ b/protocols/bundles/org.jivesoftware.smack/src/org/jivesoftware/smack/keepalive/KeepAliveManager.java @@ -276,10 +276,10 @@ public class KeepAliveManager { public void run() { Ping ping = new Ping(); PacketFilter responseFilter = new PacketIDFilter(ping.getPacketID()); - final PacketCollector response = connection.createPacketCollector(responseFilter); + final PacketCollector response = pingFailedListeners.isEmpty() ? null : connection.createPacketCollector(responseFilter); connection.sendPacket(ping); - if (!pingFailedListeners.isEmpty()) { + if (response != null) { // Schedule a collector for the ping reply, notify listeners if none is received. periodicPingExecutorService.schedule(new Runnable() { @Override |