You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2011/01/27 16:21:40 UTC
svn commit: r1064155 - in /cassandra/branches/cassandra-0.7: CHANGES.txt
src/java/org/apache/cassandra/cli/CliClient.java
Author: jbellis
Date: Thu Jan 27 15:21:39 2011
New Revision: 1064155
URL: http://svn.apache.org/viewvc?rev=1064155&view=rev
Log:
fix CLI "show keyspaces" with null options on NTS
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-2049
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1064155&r1=1064154&r2=1064155&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Jan 27 15:21:39 2011
@@ -2,6 +2,7 @@
* fix potential overflow in nodetool cfstats (CASSANDRA-2057)
* add JVM shutdownhook to sync commitlog (CASSANDRA-1919)
* allow nodes to be up without being part of normal traffic (CASSANDRA-1951)
+ * fix CLI "show keyspaces" with null options on NTS (CASSANDRA-2049)
0.7.1
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java?rev=1064155&r1=1064154&r2=1064155&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java (original)
+++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java Thu Jan 27 15:21:39 2011
@@ -1237,9 +1237,14 @@ public class CliClient extends CliUserHe
sessionState.out.println(" Replication Strategy: " + ks_def.strategy_class);
if (ks_def.strategy_class.endsWith(".NetworkTopologyStrategy"))
- sessionState.out.println(" Options: " + FBUtilities.toString(ks_def.strategy_options));
+ {
+ Map<String, String> options = ks_def.strategy_options;
+ sessionState.out.println(" Options: [" + ((options == null) ? "" : FBUtilities.toString(options)) + "]");
+ }
else
+ {
sessionState.out.println(" Replication Factor: " + ks_def.replication_factor);
+ }
sessionState.out.println(" Column Families:");