[KARAF-2142] Simplify the consumer, handler, producer commands code git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/branches/cellar-2.3.x@1483428 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/923d07bc Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/923d07bc Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/923d07bc Branch: refs/heads/cellar-2.3.x Commit: 923d07bcf91fe8dfdecc0b330906c34c99d60681 Parents: 918e31a Author: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Authored: Thu May 16 16:03:03 2013 +0000 Committer: jbonofre <jbonofre@13f79535-47bb-0310-9956-ffa450edef68> Committed: Thu May 16 16:03:03 2013 +0000 ---------------------------------------------------------------------- .../org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java | 4 +--- .../org/apache/karaf/cellar/shell/handler/HandlersSupport.java | 4 +--- .../org/apache/karaf/cellar/shell/producer/ProducerSupport.java | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/923d07bc/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java b/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java index f60a45d..86428d9 100644 --- a/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java +++ b/shell/src/main/java/org/apache/karaf/cellar/shell/consumer/ConsumerSupport.java @@ -37,9 +37,8 @@ public abstract class ConsumerSupport extends ClusterCommandSupport { ConsumerSwitchCommand command = new ConsumerSwitchCommand(clusterManager.generateId()); // looking for nodes and check if exist - Set<Node> recipientList; + Set<Node> recipientList = new HashSet<Node>(); if (nodeIds != null && !nodeIds.isEmpty()) { - recipientList = new HashSet<Node>(); for (String nodeId : nodeIds) { Node node = clusterManager.findNodeById(nodeId); if (node == null) { @@ -54,7 +53,6 @@ public abstract class ConsumerSupport extends ClusterCommandSupport { recipientList = clusterManager.listNodes(); } else { // in case of status change, select only the local node - recipientList = new HashSet<Node>(); recipientList.add(clusterManager.getNode()); } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/923d07bc/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java b/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java index 8b908e9..1f6b250 100644 --- a/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java +++ b/shell/src/main/java/org/apache/karaf/cellar/shell/handler/HandlersSupport.java @@ -36,9 +36,8 @@ public abstract class HandlersSupport extends ClusterCommandSupport { ManageHandlersCommand command = new ManageHandlersCommand(clusterManager.generateId()); // looking for nodes and check if exist - Set<Node> recipientList; + Set<Node> recipientList = new HashSet<Node>(); if (nodeIds != null && !nodeIds.isEmpty()) { - recipientList = new HashSet<Node>(); for (String nodeId : nodeIds) { Node node = clusterManager.findNodeById(nodeId); if (node == null) { @@ -53,7 +52,6 @@ public abstract class HandlersSupport extends ClusterCommandSupport { recipientList = clusterManager.listNodes(); } else { // in case of status change, select only the local node - recipientList = new HashSet<Node>(); recipientList.add(clusterManager.getNode()); } } http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/923d07bc/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java ---------------------------------------------------------------------- diff --git a/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java b/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java index 1287e42..3f079fa 100644 --- a/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java +++ b/shell/src/main/java/org/apache/karaf/cellar/shell/producer/ProducerSupport.java @@ -34,9 +34,8 @@ public abstract class ProducerSupport extends ClusterCommandSupport { ProducerSwitchCommand command = new ProducerSwitchCommand(clusterManager.generateId()); // looking for nodes and check if exist - Set<Node> recipientList; + Set<Node> recipientList = new HashSet<Node>(); if (nodeIds != null && !nodeIds.isEmpty()) { - recipientList = new HashSet<Node>(); for (String nodeId : nodeIds) { Node node = clusterManager.findNodeById(nodeId); if (node == null) { @@ -51,7 +50,6 @@ public abstract class ProducerSupport extends ClusterCommandSupport { recipientList = clusterManager.listNodes(); } else { // in case of status change, select only the local node - recipientList = new HashSet<Node>(); recipientList.add(clusterManager.getNode()); } }
