Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 746c45853 -> 4223aad66 refs/heads/trunk a4d075800 -> 370e72d0f
Fix exit code in nodetool when keyspace does not exist. Patch by Sachin Janani, reviewed by brandonwilliams for CASSANDRA-8776 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4223aad6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4223aad6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4223aad6 Branch: refs/heads/cassandra-2.1 Commit: 4223aad66832b217a6be4ecca31b31bab804720a Parents: 746c458 Author: Brandon Williams <[email protected]> Authored: Fri Feb 13 12:09:50 2015 -0600 Committer: Brandon Williams <[email protected]> Committed: Fri Feb 13 12:09:50 2015 -0600 ---------------------------------------------------------------------- src/java/org/apache/cassandra/tools/NodeTool.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4223aad6/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeTool.java b/src/java/org/apache/cassandra/tools/NodeTool.java index e5d8611..a639b45 100644 --- a/src/java/org/apache/cassandra/tools/NodeTool.java +++ b/src/java/org/apache/cassandra/tools/NodeTool.java @@ -2066,7 +2066,7 @@ public class NodeTool StringBuffer errors = new StringBuffer(); - Map<InetAddress, Float> ownerships; + Map<InetAddress, Float> ownerships = null; try { ownerships = probe.effectiveOwnership(keyspace); @@ -2079,7 +2079,7 @@ public class NodeTool catch (IllegalArgumentException ex) { System.out.printf("%nError: " + ex.getMessage() + "%n"); - return; + System.exit(1); } Map<String, SetHostStat> dcs = getOwnershipByDc(probe, resolveIp, tokensToEndpoints, ownerships);
