Commit 8f1ac77c authored by akrherz's avatar akrherz

Revert "change sync key as per @guusdk suggestion"

This reverts commit 508e39e2 and hopefully resolves OF-1263 and OF-1269
parent 2c2a3d10
......@@ -212,7 +212,7 @@ public class GroupManager {
JID userJid = new JID(user);
if (XMPPServer.getInstance().isLocal(userJid)) {
String username = userJid.getNode();
synchronized ((getClass().getSimpleName() + username).intern()) {
synchronized (username.intern()) {
groupMetaCache.remove(username);
}
}
......@@ -477,7 +477,7 @@ public class GroupManager {
public Collection<Group> getSharedGroups(String userName) {
Collection<String> groupNames = (Collection<String>)groupMetaCache.get(userName);
if (groupNames == null) {
synchronized((getClass().getSimpleName() + userName).intern()) {
synchronized(userName.intern()) {
groupNames = (Collection<String>)groupMetaCache.get(userName);
if (groupNames == null) {
// assume this is a local user
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment