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 2013/12/18 13:23:04 UTC
[29/50] [abbrv] git commit: [KARAF-2142] Simplify consumer, handlers,
producer commands code
[KARAF-2142] Simplify consumer, handlers, producer commands code
git-svn-id: https://svn.apache.org/repos/asf/karaf/cellar/trunk@1483432 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/8a85ea74
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/8a85ea74
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/8a85ea74
Branch: refs/heads/master
Commit: 8a85ea7492fd957a570ecb39b1b41bbc56f357ca
Parents: 4c5d87a
Author: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Authored: Thu May 16 16:11:46 2013 +0000
Committer: jbonofre <jb...@13f79535-47bb-0310-9956-ffa450edef68>
Committed: Thu May 16 16:11:46 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/8a85ea74/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 17f7cc3..38ecfee 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/8a85ea74/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 bcbc67c..c4c0271 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/8a85ea74/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 84fd040..602abb7 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
@@ -37,9 +37,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) {
@@ -54,7 +53,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());
}
}