Author: eevans
Date: Fri Nov 13 21:13:31 2009
New Revision: 835990
URL: http://svn.apache.org/viewvc?rev=835990&view=rev
Log:
gracefully handle missing keyspace argument (cli)
Patch by Hafsteinn Baldvinsson; reviewed by eevans for CASSANDRA-551
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
Modified:
incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
URL:
http://svn.apache.org/viewvc/incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java?rev=835990&r1=835989&r2=835990&view=diff
==============================================================================
--- incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
(original)
+++ incubator/cassandra/trunk/src/java/org/apache/cassandra/cli/CliClient.java
Fri Nov 13 21:13:31 2009
@@ -251,8 +251,14 @@
// Get table name
int childCount = ast.getChildCount();
assert(childCount == 1);
+
String tableName = ast.getChild(0).getText();
-
+
+ if( tableName == null ) {
+ css_.out.println("Keyspace argument required");
+ return;
+ }
+
// Describe and display
Map<String, Map<String, String>> columnFamiliesMap;
try {
