Revert "OF-867 Wrong key in groupMetaCache evict"

This reverts commit ffe14c9 and hopefully resolves OF-1263 and OF-1269
igniterealtime · Feb 24, 2017 · e1ce54a · e1ce54a
1 parent 0994a25
commit e1ce54a
Showing 1 changed file with 13 additions and 16 deletions.
diff --git a/src/java/org/jivesoftware/openfire/group/GroupManager.java b/src/java/org/jivesoftware/openfire/group/GroupManager.java
@@ -175,7 +175,9 @@ public void memberAdded(Group group, Map params) {
 
                 // 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
@@ -186,7 +188,9 @@ public void memberRemoved(Group group, Map params) {
 
                 // 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
@@ -197,7 +201,9 @@ public void adminAdded(Group group, Map params) {
 
                 // 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
@@ -208,20 +214,11 @@ public void adminRemoved(Group group, Map params) {
 
                 // Remove only the collection of groups the member belongs to.
                 String member = (String) params.get("admin");
-                evictCachedUserForGroup(member);
+                if(member != null) {
+	                groupMetaCache.remove(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);
-                        }
-                    }
-                 }
-            }
         });
 
         UserEventDispatcher.addListener(new UserEventListener() {
@@ -590,7 +587,7 @@ public Collection<Group> getGroups(User user) {
      * @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) {