Revert "OF-867 Wrong key in groupMetaCache evict"

This reverts commit ffe14c90 and hopefully resolves OF-1263 and OF-1269

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

@@ -171,7 +171,9 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("member");
-                evictCachedUserForGroup(member);
+                if(member != null) {
+	                groupMetaCache.remove(member);
+                }
             }
 
             @Override
@@ -182,7 +184,9 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("member");
-                evictCachedUserForGroup(member);
+                if(member != null) {
+	                groupMetaCache.remove(member);
+                }
             }
 
             @Override
@@ -193,7 +197,9 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("admin");
-                evictCachedUserForGroup(member);
+                if(member != null) {
+	                groupMetaCache.remove(member);
+                }
             }
 
             @Override
@@ -204,20 +210,11 @@ public class GroupManager {
                 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("admin");
-                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 (username.intern()) {
-                            groupMetaCache.remove(username);
-                        }
-                    }
+                if(member != null) {
+	                groupMetaCache.remove(member);
                 }
             }
+
         });
 
         UserEventDispatcher.addListener(new UserEventListener() {
@@ -586,7 +583,7 @@ public class GroupManager {
      * @return all groups that an entity belongs to.
      */
     public Collection<Group> getGroups(JID user) {
-        String key = user.getNode();
+        String key = user.toBareJID();
 
         Collection<String> groupNames = (Collection<String>)groupMetaCache.get(key);
         if (groupNames == null) {