mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-10-31 17:25:58 +01:00
Fix memory leak caused by RosterGroup
SMACK-672
This commit is contained in:
parent
6632345efc
commit
7a3ca4fd68
1 changed files with 6 additions and 15 deletions
|
@ -23,7 +23,7 @@ import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.jivesoftware.smack.PacketCollector;
|
import org.jivesoftware.smack.Manager;
|
||||||
import org.jivesoftware.smack.XMPPConnection;
|
import org.jivesoftware.smack.XMPPConnection;
|
||||||
import org.jivesoftware.smack.SmackException.NoResponseException;
|
import org.jivesoftware.smack.SmackException.NoResponseException;
|
||||||
import org.jivesoftware.smack.SmackException.NotConnectedException;
|
import org.jivesoftware.smack.SmackException.NotConnectedException;
|
||||||
|
@ -38,10 +38,9 @@ import org.jxmpp.util.XmppStringUtils;
|
||||||
* @see Roster#getGroup(String)
|
* @see Roster#getGroup(String)
|
||||||
* @author Matt Tucker
|
* @author Matt Tucker
|
||||||
*/
|
*/
|
||||||
public class RosterGroup {
|
public class RosterGroup extends Manager {
|
||||||
|
|
||||||
private final String name;
|
private final String name;
|
||||||
private final XMPPConnection connection;
|
|
||||||
private final Set<RosterEntry> entries;
|
private final Set<RosterEntry> entries;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -51,8 +50,8 @@ public class RosterGroup {
|
||||||
* @param connection the connection the group belongs to.
|
* @param connection the connection the group belongs to.
|
||||||
*/
|
*/
|
||||||
RosterGroup(String name, XMPPConnection connection) {
|
RosterGroup(String name, XMPPConnection connection) {
|
||||||
|
super(connection);
|
||||||
this.name = name;
|
this.name = name;
|
||||||
this.connection = connection;
|
|
||||||
entries = new LinkedHashSet<RosterEntry>();
|
entries = new LinkedHashSet<RosterEntry>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -85,7 +84,7 @@ public class RosterGroup {
|
||||||
item.removeGroupName(this.name);
|
item.removeGroupName(this.name);
|
||||||
item.addGroupName(name);
|
item.addGroupName(name);
|
||||||
packet.addRosterItem(item);
|
packet.addRosterItem(item);
|
||||||
connection.createPacketCollectorAndSend(packet).nextResultOrThrow();
|
connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -171,7 +170,6 @@ public class RosterGroup {
|
||||||
* @throws NotConnectedException
|
* @throws NotConnectedException
|
||||||
*/
|
*/
|
||||||
public void addEntry(RosterEntry entry) throws NoResponseException, XMPPErrorException, NotConnectedException {
|
public void addEntry(RosterEntry entry) throws NoResponseException, XMPPErrorException, NotConnectedException {
|
||||||
PacketCollector collector = null;
|
|
||||||
// Only add the entry if it isn't already in the list.
|
// Only add the entry if it isn't already in the list.
|
||||||
synchronized (entries) {
|
synchronized (entries) {
|
||||||
if (!entries.contains(entry)) {
|
if (!entries.contains(entry)) {
|
||||||
|
@ -181,12 +179,9 @@ public class RosterGroup {
|
||||||
item.addGroupName(getName());
|
item.addGroupName(getName());
|
||||||
packet.addRosterItem(item);
|
packet.addRosterItem(item);
|
||||||
// Wait up to a certain number of seconds for a reply from the server.
|
// Wait up to a certain number of seconds for a reply from the server.
|
||||||
collector = connection.createPacketCollectorAndSend(packet);
|
connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (collector != null) {
|
|
||||||
collector.nextResultOrThrow();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -202,7 +197,6 @@ public class RosterGroup {
|
||||||
* @throws NotConnectedException
|
* @throws NotConnectedException
|
||||||
*/
|
*/
|
||||||
public void removeEntry(RosterEntry entry) throws NoResponseException, XMPPErrorException, NotConnectedException {
|
public void removeEntry(RosterEntry entry) throws NoResponseException, XMPPErrorException, NotConnectedException {
|
||||||
PacketCollector collector = null;
|
|
||||||
// Only remove the entry if it's in the entry list.
|
// Only remove the entry if it's in the entry list.
|
||||||
// Remove the entry locally, if we wait for RosterPacketListenerprocess>>Packet(Packet)
|
// Remove the entry locally, if we wait for RosterPacketListenerprocess>>Packet(Packet)
|
||||||
// to take place the entry will exist in the group until a packet is received from the
|
// to take place the entry will exist in the group until a packet is received from the
|
||||||
|
@ -215,12 +209,9 @@ public class RosterGroup {
|
||||||
item.removeGroupName(this.getName());
|
item.removeGroupName(this.getName());
|
||||||
packet.addRosterItem(item);
|
packet.addRosterItem(item);
|
||||||
// Wait up to a certain number of seconds for a reply from the server.
|
// Wait up to a certain number of seconds for a reply from the server.
|
||||||
collector = connection.createPacketCollectorAndSend(packet);
|
connection().createPacketCollectorAndSend(packet).nextResultOrThrow();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (collector != null) {
|
|
||||||
collector.nextResultOrThrow();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void addEntryLocal(RosterEntry entry) {
|
void addEntryLocal(RosterEntry entry) {
|
||||||
|
|
Loading…
Reference in a new issue