Fix shared group presence problem with "complex" group visibility setup. JM-972

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@7079 b35dd754-fafc-0310-a699-88a17e54d16e

src/java/org/jivesoftware/wildfire/roster/RosterManager.java

@@ -885,6 +885,18 @@ public class RosterManager extends BasicModule implements GroupEventListener, Us
                                 otherGroupNames.contains(group.getName())) {
                             return true;
                         }
+                        // Check if both shared groups have a common group that can see both shared groups and
+                        // the users belong to such group
+                        Collection<Group> groupList = parseGroups(groupNames);
+                        Collection<Group> otherGroupList = parseGroups(otherGroupNames);
+                        for (Group groupName : groupList) {
+                            for (Group otherGroupName : otherGroupList) {
+                                if (groupName.equals(otherGroupName) && groupName.isUser(user) &&
+                                        otherGroupName.isUser(otherUser)) {
+                                    return true;
+                                }
+                            }
+                        }
                     }
                 }
                 else if ("everybody".equals(showInRoster) && "onlyGroup".equals(otherShowInRoster)) {