narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

no longer use ConcurrentHashMap in favor of synchronize on a final HashMap

Browse source
This commit is contained in:
Daniel Gultsch 2015-01-04 00:14:40 +01:00
parent 4f4eff2353
commit f338d89753
1 changed files with 27 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
src/main/java/eu/siacs/conversations/entities/Roster.java
View file

@ -1,14 +1,14 @@
package eu.siacs.conversations.entities;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import eu.siacs.conversations.xmpp.jid.Jid;
public class Roster {
final Account account;
final ConcurrentHashMap<String, Contact> contacts = new ConcurrentHashMap<>();
final HashMap<String, Contact> contacts = new HashMap<>();
private String version = null;
public Roster(Account account) {
@ -19,23 +19,27 @@ public class Roster {
if (jid == null) {
return null;
}
final Contact contact = contacts.get(jid.toBareJid().toString());
if (contact != null && contact.showInRoster()) {
return contact;
} else {
return null;
synchronized (this.contacts) {
Contact contact = contacts.get(jid.toBareJid().toString());
if (contact != null && contact.showInRoster()) {
return contact;
} else {
return null;
}
}
}
public Contact getContact(final Jid jid) {
final Jid bareJid = jid.toBareJid();
if (contacts.containsKey(bareJid.toString())) {
return contacts.get(bareJid.toString());
} else {
final Contact contact = new Contact(bareJid);
contact.setAccount(account);
contacts.put(bareJid.toString(), contact);
return contact;
synchronized (this.contacts) {
final Jid bareJid = jid.toBareJid();
if (contacts.containsKey(bareJid.toString())) {
return contacts.get(bareJid.toString());
} else {
Contact contact = new Contact(bareJid);
contact.setAccount(account);
contacts.put(bareJid.toString(), contact);
return contact;
}
}
}
@ -46,13 +50,13 @@ public class Roster {
}
public void markAllAsNotInRoster() {
for (final Contact contact : getContacts()) {
for (Contact contact : getContacts()) {
contact.resetOption(Contact.Options.IN_ROSTER);
}
}
public void clearSystemAccounts() {
for (final Contact contact : getContacts()) {
for (Contact contact : getContacts()) {
contact.setPhotoUri(null);
contact.setSystemName(null);
contact.setSystemAccount(null);
@ -60,13 +64,17 @@ public class Roster {
}
public List<Contact> getContacts() {
return new ArrayList<>(this.contacts.values());
synchronized (this.contacts) {
return new ArrayList<>(this.contacts.values());
}
}
public void initContact(final Contact contact) {
contact.setAccount(account);
contact.setOption(Contact.Options.IN_ROSTER);
contacts.put(contact.getJid().toBareJid().toString(), contact);
synchronized (this.contacts) {
contacts.put(contact.getJid().toBareJid().toString(), contact);
}
}
public void setVersion(String version) {