svn commit: r921125 - in /incubator/cassandra/branches/cassandra-0.6: CHANGES.txt src/java/org/apache/cassandra/cli/CliMain.java

[jbellis]

Author: jbellis
Date: Tue Mar  9 21:03:48 2010
New Revision: 921125

URL: http://svn.apache.org/viewvc?rev=921125&view=rev
Log:
allow re-specifying host, port to cassandra-cli if invalid ones are first 
tried.  patch by Morten Wegelbye Holm; reviewed by jbellis for CASSANDRA-867

Modified:
    incubator/cassandra/branches/cassandra-0.6/CHANGES.txt
    
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/CliMain.java

Modified: incubator/cassandra/branches/cassandra-0.6/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.6/CHANGES.txt?rev=921125&r1=921124&r2=921125&view=diff
==============================================================================
--- incubator/cassandra/branches/cassandra-0.6/CHANGES.txt (original)
+++ incubator/cassandra/branches/cassandra-0.6/CHANGES.txt Tue Mar  9 21:03:48 
2010
@@ -16,6 +16,8 @@
  * Add a jmx status to the streaming service and change several DEBUG
    messages to INFO (CASSANDRA-845)
  * fix classpath in cassandra-cli.bat for Windows (CASSANDRA-858)
+ * allow re-specifying host, port to cassandra-cli if invalid ones
+   are first tried (CASSANDRA-867)
 
 
 0.6.0-beta1/beta2

Modified: 
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/CliMain.java
URL: 
http://svn.apache.org/viewvc/incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/CliMain.java?rev=921125&r1=921124&r2=921125&view=diff
==============================================================================
--- 
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/CliMain.java
 (original)
+++ 
incubator/cassandra/branches/cassandra-0.6/src/java/org/apache/cassandra/cli/CliMain.java
 Tue Mar  9 21:03:48 2010
@@ -235,9 +235,11 @@ public class CliMain
         {
             connect(css_.hostName, css_.thriftPort);
         }
-        else 
+        
+        if ( cliClient_ == null )
         {
-            // If not, client must connect explicitly using the "connect" CLI 
statement.
+            // Connection parameter was either invalid or not present.
+            // User must connect explicitly using the "connect" CLI statement.
             cliClient_ = new CliClient(css_, null);
         }