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/04/30 19:04:14 UTC

svn commit: r1332294 - /karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java

Author: jbonofre
Date: Mon Apr 30 17:04:14 2012
New Revision: 1332294

URL: http://svn.apache.org/viewvc?rev=1332294&view=rev
Log:
[KARAF-1413] Fix the all nodes handler status lookup

Modified:
    karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java

Modified: karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java
URL: http://svn.apache.org/viewvc/karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java?rev=1332294&r1=1332293&r2=1332294&view=diff
==============================================================================
--- karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java (original)
+++ karaf/cellar/branches/cellar-2.2.x/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java Mon Apr 30 17:04:14 2012
@@ -34,13 +34,15 @@ public abstract class HandlersSupport ex
      */
     protected Object doExecute(String handlerName, List<String> nodes, Boolean status) throws Exception {
         ManageHandlersCommand command = new ManageHandlersCommand(clusterManager.generateId());
-        Set<Node> recipientList = clusterManager.listNodes(nodes);
 
-        // set the recipient list
-        if (recipientList != null && !recipientList.isEmpty()) {
-            command.setDestination(recipientList);
+        Set<Node> recipientList;
+        if (nodes == null || nodes.isEmpty()) {
+            recipientList = clusterManager.listNodes();
+        } else {
+            recipientList = clusterManager.listNodes(nodes);
         }
 
+        command.setDestination(recipientList);
         command.setHandlerName(handlerName);
         command.setStatus(status);