[DS-90] Workflow doesn't skipped if the wf group contains empty subgroups

git-svn-id: http://scm.dspace.org/svn/repo/branches/dspace-1_5_x@3587 9c30dcfa-912a-0410-8fc2-9e0234be79fd

dspace-api/src/main/java/org/dspace/eperson/Group.java

@@ -1051,21 +1051,31 @@ public class Group extends DSpaceObject
     }
     
     /**
-     * Return true if group has no members
+     * Return true if group has no direct or indirect members
      */
     public boolean isEmpty()
     {
         loadData(); // make sure all data is loaded
         
-        if ((epeople.size() == 0) && (groups.size() == 0))
+        // the only fast check available is on epeople... 
+        boolean hasMembers = (epeople.size() != 0);
+        
+        if (hasMembers)
         {
-            return true;
+            return false;
         }
         else
         {
+            // well, groups is never null...
+            for (Group subGroup : groups){
+                hasMembers = !subGroup.isEmpty();
+                if (hasMembers){
                     return false;
                 }
             }
+            return !hasMembers;
+        }
+    }
 
     /**
      * Update the group - writing out group object and EPerson list if necessary

dspace/CHANGES

@@ -83,6 +83,7 @@
  - [DS-58] Double quote problem in some fields of JSPUI (continued) - ID: 2528065
  - [DS-88] Anonymous group don't works as subgroup - ID: 1688445
  - [DS-61] IP Authentication only works on logged in users - ID: 2088431
+ - [DS-90] Workflow doesn't skipped if the wf group contains empty subgroups
  
 (Paulo Jobim)
  - SF Patch [2655052] Authors re-ordered when item edited (xmlui)