Merge pull request #713 from akrherz/of867

OF-867 Wrong key in groupMetaCache evict

src/java/org/jivesoftware/openfire/group/GroupManager.java

@@ -174,9 +174,7 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("member");
-                if(member != null) {
-	                groupMetaCache.remove(member);
-                }
+                evictCachedUserForGroup(member);
             }
 
             @Override
@@ -187,9 +185,7 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("member");
-                if(member != null) {
-	                groupMetaCache.remove(member);
-                }
+                evictCachedUserForGroup(member);
             }
 
             @Override
@@ -200,9 +196,7 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("admin");
-                if(member != null) {
-	                groupMetaCache.remove(member);
-                }
+                evictCachedUserForGroup(member);
             }
 
             @Override
@@ -213,11 +207,20 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("admin");
-                if(member != null) {
-	                groupMetaCache.remove(member);
-                }
+                evictCachedUserForGroup(member);
             }
 
+            private void evictCachedUserForGroup(String user) {
+                if(user != null) {
+                    JID userJid = new JID(user);
+                    if (XMPPServer.getInstance().isLocal(userJid)) {
+                        String username = userJid.getNode();
+                        synchronized ((getClass().getSimpleName() + username).intern()) {
+                            groupMetaCache.remove(username);
+                        }
+                    }
+                 }
+            }
         });
 
         UserEventDispatcher.addListener(new UserEventListener() {
@@ -477,7 +480,7 @@ public class GroupManager {
     public Collection<Group> getSharedGroups(String userName) {
         Collection<String> groupNames = (Collection<String>)groupMetaCache.get(userName);
         if (groupNames == null) {
-            synchronized(userName.intern()) {
+            synchronized((getClass().getSimpleName() + userName).intern()) {
                 groupNames = (Collection<String>)groupMetaCache.get(userName);
                 if (groupNames == null) {
                 	// assume this is a local user
@@ -586,7 +589,7 @@ public class GroupManager {
      * @return all groups that an entity belongs to.
      */
     public Collection<Group> getGroups(JID user) {
-        String key = user.toBareJID();
+        String key = user.getNode();
 
         Collection<String> groupNames = (Collection<String>)groupMetaCache.get(key);
         if (groupNames == null) {