Commit 9d4de84b authored by Daryl Herzmann's avatar Daryl Herzmann Committed by akrherz

Check hasMutualVisibility with sharedGroups, not userGroups JM-851


git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@11087 b35dd754-fafc-0310-a699-88a17e54d16e
parent d6a51732
...@@ -143,7 +143,7 @@ public class Roster implements Cacheable, Externalizable { ...@@ -143,7 +143,7 @@ public class Roster implements Cacheable, Externalizable {
} }
// Set subscription type to BOTH if the roster user belongs to a shared group // Set subscription type to BOTH if the roster user belongs to a shared group
// that is mutually visible with a shared group of the new roster item // that is mutually visible with a shared group of the new roster item
if (rosterManager.hasMutualVisibility(username, userGroups, jid, itemGroups)) { if (rosterManager.hasMutualVisibility(username, sharedGroups, jid, itemGroups)) {
item.setSubStatus(RosterItem.SUB_BOTH); item.setSubStatus(RosterItem.SUB_BOTH);
} }
else { else {
...@@ -1128,4 +1128,4 @@ public class Roster implements Cacheable, Externalizable { ...@@ -1128,4 +1128,4 @@ public class Roster implements Cacheable, Externalizable {
ExternalizableUtil.getInstance().readExternalizableMap(in, rosterItems, getClass().getClassLoader()); ExternalizableUtil.getInstance().readExternalizableMap(in, rosterItems, getClass().getClassLoader());
ExternalizableUtil.getInstance().readStringsMap(in, implicitFrom); ExternalizableUtil.getInstance().readStringsMap(in, implicitFrom);
} }
} }
\ No newline at end of file
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