Commit 34beb388 authored by Guus der Kinderen's avatar Guus der Kinderen Committed by akrherz

OF-1263: Improve cache invalidation for group metadata

When evicting cache entries for group members, the members of other
groups that are affected should also be evicted.
parent 93e23e4b
...@@ -23,6 +23,7 @@ package org.jivesoftware.openfire.group; ...@@ -23,6 +23,7 @@ package org.jivesoftware.openfire.group;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer;
import org.jivesoftware.openfire.XMPPServer; import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.event.GroupEventDispatcher; import org.jivesoftware.openfire.event.GroupEventDispatcher;
...@@ -675,6 +676,40 @@ public class GroupManager { ...@@ -675,6 +676,40 @@ public class GroupManager {
for (JID user : group.getMembers()) { for (JID user : group.getMembers()) {
groupMetaCache.remove(user.getNode()); groupMetaCache.remove(user.getNode());
} }
final String showInRoster = group.getProperties().get("sharedRoster.showInRoster");
if (showInRoster != null )
{
switch ( showInRoster.toLowerCase() )
{
case "everybody":
groupMetaCache.clear();
break;
case "spefgroups":
final String groupList = group.getProperties().get( "sharedRoster.groupList" );
if ( groupList != null )
{
final StringTokenizer tokenizer = new StringTokenizer( groupList, ",\t\n\r\f" );
while ( tokenizer.hasMoreTokens() )
{
final String spefgroup = tokenizer.nextToken().trim();
try
{
final Group nested = getGroup( spefgroup );
evictCachedUsersForGroup( nested );
}
catch ( GroupNotFoundException e )
{
Log.debug( "While evicting cached users for group '{}', an unrecognized spefgroup was found: '{}'", group.getName(), spefgroup, e );
}
}
}
break;
}
}
} }
private void evictCachedPaginatedGroupNames() { private void evictCachedPaginatedGroupNames() {
......
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