svn commit: r1071789 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java

[jbellis]

Author: jbellis
Date: Thu Feb 17 21:05:42 2011
New Revision: 1071789

URL: http://svn.apache.org/viewvc?rev=1071789&view=rev
Log:
Swap the order of processing the authentication and keyspace CLI arguments
patch by Jim Ancona; reviewed by Pavel Yaskevich for CASSANDRA-2162

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java?rev=1071789&r1=1071788&r2=1071789&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java 
(original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliMain.java 
Thu Feb 17 21:05:42 2011
@@ -90,32 +90,6 @@ public class CliMain
         thriftClient = cassandraClient;
         cliClient = new CliClient(sessionState, thriftClient);
         
-        if (sessionState.keyspace != null)
-        {
-            try
-            {
-                sessionState.keyspace = 
CliCompiler.getKeySpace(sessionState.keyspace, 
thriftClient.describe_keyspaces());;
-                thriftClient.set_keyspace(sessionState.keyspace);
-                cliClient.setKeySpace(sessionState.keyspace);
-                
updateCompletor(CliUtils.getCfNamesByKeySpace(cliClient.getKSMetaData(sessionState.keyspace)));
-            }
-            catch (InvalidRequestException e)
-            {
-                sessionState.err.println("Keyspace " + sessionState.keyspace + 
" not found");
-                return;
-            }
-            catch (TException e)
-            {
-                sessionState.err.println("Did you specify 'keyspace'?");
-                return;
-            }
-            catch (NotFoundException e)
-            {
-                sessionState.err.println("Keyspace " + sessionState.keyspace + 
" not found");
-                return;
-            }
-        }
-
         if ((sessionState.username != null) && (sessionState.password != null))
         {
             // Authenticate
@@ -149,6 +123,32 @@ public class CliMain
             }
         }
         
+        if (sessionState.keyspace != null)
+        {
+            try
+            {
+                sessionState.keyspace = 
CliCompiler.getKeySpace(sessionState.keyspace, 
thriftClient.describe_keyspaces());;
+                thriftClient.set_keyspace(sessionState.keyspace);
+                cliClient.setKeySpace(sessionState.keyspace);
+                
updateCompletor(CliUtils.getCfNamesByKeySpace(cliClient.getKSMetaData(sessionState.keyspace)));
+            }
+            catch (InvalidRequestException e)
+            {
+                sessionState.err.println("Keyspace " + sessionState.keyspace + 
" not found");
+                return;
+            }
+            catch (TException e)
+            {
+                sessionState.err.println("Did you specify 'keyspace'?");
+                return;
+            }
+            catch (NotFoundException e)
+            {
+                sessionState.err.println("Keyspace " + sessionState.keyspace + 
" not found");
+                return;
+            }
+        }
+
         // Lookup the cluster name, this is to make it clear which cluster the 
user is connected to
         String clusterName;