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 2011/08/31 16:37:36 UTC
svn commit: r1163647 - in /karaf/cellar/trunk:
config/src/main/java/org/apache/karaf/cellar/config/shell/
shell/src/main/java/org/apache/karaf/cellar/shell/
shell/src/main/java/org/apache/karaf/cellar/shell/group/
Author: jbonofre
Date: Wed Aug 31 14:37:36 2011
New Revision: 1163647
URL: http://svn.apache.org/viewvc?rev=1163647&view=rev
Log:
[KARAF-839] Fix a NPE raised when pinging an unknown node.
Modified:
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java
karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java?rev=1163647&r1=1163646&r2=1163647&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/ListCommand.java Wed Aug 31 14:37:36 2011
@@ -41,12 +41,12 @@ public class ListCommand extends ConfigC
Map<String, Properties> configurationTable = clusterManager.getMap(Constants.CONFIGURATION_MAP + Configurations.SEPARATOR + groupName);
if (configurationTable != null && !configurationTable.isEmpty()) {
- System.out.println(String.format("PIDs for group:" + groupName));
+ System.out.println(String.format("PIDs for group " + groupName));
System.out.println(String.format(OUTPUT_FORMAT, "PID"));
for (String pid : configurationTable.keySet()) {
System.out.println(String.format(OUTPUT_FORMAT, pid));
}
- } else System.err.println("No PIDs found for group:" + groupName);
+ } else System.err.println("No PIDs found for group " + groupName);
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java?rev=1163647&r1=1163646&r2=1163647&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropListCommand.java Wed Aug 31 14:37:36 2011
@@ -45,7 +45,7 @@ public class PropListCommand extends Cel
Map<String, Properties> configurationTable = clusterManager.getMap(Constants.CONFIGURATION_MAP + Configurations.SEPARATOR + groupName);
if (configurationTable != null && !configurationTable.isEmpty()) {
- System.out.println(String.format("Property list for PID:" + pid + " for group:" + groupName));
+ System.out.println(String.format("Property list for PID " + pid + " for group " + groupName));
System.out.println(String.format(OUTPUT_FORMAT, "Key", "Value"));
Properties properties = configurationTable.get(pid);
if (properties != null && !properties.isEmpty())
@@ -53,7 +53,7 @@ public class PropListCommand extends Cel
String value = properties.getProperty((String) key);
System.out.println(String.format(OUTPUT_FORMAT, key, value));
}
- } else System.err.print("No PIDs found for group:" + groupName);
+ } else System.err.print("No PIDs found for group " + groupName);
} finally {
Thread.currentThread().setContextClassLoader(originalClassLoader);
}
Modified: karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java?rev=1163647&r1=1163646&r2=1163647&view=diff
==============================================================================
--- karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java (original)
+++ karaf/cellar/trunk/config/src/main/java/org/apache/karaf/cellar/config/shell/PropSetCommand.java Wed Aug 31 14:37:36 2011
@@ -43,12 +43,14 @@ public class PropSetCommand extends Conf
@Override
protected Object doExecute() throws Exception {
Map<String, Properties> configurationTable = clusterManager.getMap(Constants.CONFIGURATION_MAP + Configurations.SEPARATOR + groupName);
- Properties properties = configurationTable.get(pid);
- if (properties == null) {
- properties = new Properties();
+ if (configurationTable != null) {
+ Properties properties = configurationTable.get(pid);
+ if (properties == null) {
+ properties = new Properties();
+ }
+ properties.put(key, value);
+ configurationTable.put(pid, properties);
}
- properties.put(key, value);
- configurationTable.put(pid, properties);
return null;
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java?rev=1163647&r1=1163646&r2=1163647&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/PingCommand.java Wed Aug 31 14:37:36 2011
@@ -39,16 +39,21 @@ public class PingCommand extends Cluster
@Override
protected Object doExecute() throws Exception {
Node node = clusterManager.findNodeById(nodeId);
- System.out.println("Pinging node :" + node.getId());
- for (int i = 1; i <= iterations; i++) {
- Long start = System.currentTimeMillis();
- Ping ping = new Ping(clusterManager.generateId());
- ping.setDestination(new HashSet(Arrays.asList(node)));
- executionContext.execute(ping);
- Long stop = System.currentTimeMillis();
- Long delay = stop - start;
- System.out.println(String.format("PING %s %s %sms", i, node.getId(), delay));
- Thread.sleep(interval);
+ if (node == null) {
+ System.out.println("Node " + nodeId + " is not found.");
+ }
+ else {
+ System.out.println("Pinging node :" + node.getId());
+ for (int i = 1; i <= iterations; i++) {
+ Long start = System.currentTimeMillis();
+ Ping ping = new Ping(clusterManager.generateId());
+ ping.setDestination(new HashSet(Arrays.asList(node)));
+ executionContext.execute(ping);
+ Long stop = System.currentTimeMillis();
+ Long delay = stop - start;
+ System.out.println(String.format("PING %s %s %sms", i, node.getId(), delay));
+ Thread.sleep(interval);
+ }
}
return null;
}
Modified: karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java
URL: http://svn.apache.org/viewvc/karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java?rev=1163647&r1=1163646&r2=1163647&view=diff
==============================================================================
--- karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java (original)
+++ karaf/cellar/trunk/shell/src/main/java/org/apache/karaf/cellar/shell/group/GroupDeleteCommand.java Wed Aug 31 14:37:36 2011
@@ -43,6 +43,10 @@ public class GroupDeleteCommand extends
try {
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
Group g = groupManager.findGroupByName(group);
+ if (g == null) {
+ System.out.println("Group " + group + " doesn't exist.");
+ return null;
+ }
List<String> nodes = new LinkedList<String>();
if (g.getMembers() != null && !g.getMembers().isEmpty()) {