You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2012/05/11 17:50:46 UTC

svn commit: r1337221 - /karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java

Author: jbonofre
Date: Fri May 11 15:50:46 2012
New Revision: 1337221

URL: http://svn.apache.org/viewvc?rev=1337221&view=rev
Log:
[KARAF-1321] cluster:group-* commands now display a complete summary of the group map

Modified:
    karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java

Modified: karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java?rev=1337221&r1=1337220&r2=1337221&view=diff
==============================================================================
--- karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java (original)
+++ karaf/cellar/trunk/core/src/main/java/org/apache/karaf/cellar/core/control/ManageGroupCommandHandler.java Fri May 11 15:50:46 2012
@@ -55,11 +55,7 @@ public class ManageGroupCommandHandler e
             joinGroup(targetGroupName);
         }
 
-        if (ManageGroupAction.LIST.equals(action)) {
-            addGrouListToResult(result, null);
-        } else {
-            addGrouListToResult(result, node);
-        }
+        addGroupListToResult(result);
 
         return result;
     }
@@ -68,13 +64,9 @@ public class ManageGroupCommandHandler e
      * Adds the {@link Group} list to the result.
      *
      * @param result
-     * @param node
      */
-    public void addGrouListToResult(ManageGroupResult result, Node node) {
-        Set<Group> groups = null;
-        if (node != null) {
-            groups = groupManager.listGroups(node);
-        } else groups = groupManager.listAllGroups();
+    public void addGroupListToResult(ManageGroupResult result) {
+        Set<Group> groups = groupManager.listAllGroups();
 
         for (Group g : groups) {
             if (g.getName() != null && !g.getName().isEmpty()) {