Fixed the groupsFor method in GroupServiceBean, and clarified the doc…

…umentation in ExplicitGroupServiceBean
IQSS · Jul 1, 2015 · c02e100 · c02e100
1 parent 86f36bd
commit c02e100
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/authorization/groups/GroupServiceBean.java
@@ -95,6 +95,7 @@ public Set<Group> groupsFor( RoleAssignee ra, DvObject dvo ) {
         while ( ! perimeter.isEmpty() ) {
             ExplicitGroup g = perimeter.iterator().next();
             perimeter.remove(g);
+            groups.add(g);
 
             Set<ExplicitGroup> discovered = explicitGroupProvider.groupsFor(g, dvo);
             discovered.removeAll(visited); // Ideally the conjunction is always empty, as we don't allow cycles.

diff --git a/...edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java b/...edu/harvard/iq/dataverse/authorization/groups/impl/explicit/ExplicitGroupServiceBean.java
@@ -117,7 +117,7 @@ public Set<ExplicitGroup> findAvailableFor( DvObject d ) {
     /**
      * Finds all the groups {@code ra} belongs to in the context of {@code o}. In effect,
      * collects all the groups {@code ra} belongs to and that are defined at {@code o}
-     * or one of its ancestors.
+     * or one of its ancestors. Does not take group containment into account.
      * 
      * @param ra The role assignee that belongs to the groups
      * @param o the DvObject that defines the context of the search.