cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dbros...@apache.org
Subject git commit: push down assignments to where they're needed
Date Mon, 29 Jul 2013 04:43:30 GMT
Updated Branches:
  refs/heads/trunk 6d6a5e330 -> 605c640aa


push down assignments to where they're needed


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/605c640a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/605c640a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/605c640a

Branch: refs/heads/trunk
Commit: 605c640aae57c2c8ea456e4a457032bee2130be3
Parents: 6d6a5e3
Author: Dave Brosius <dbrosius@apache.org>
Authored: Mon Jul 29 00:42:37 2013 -0400
Committer: Dave Brosius <dbrosius@apache.org>
Committed: Mon Jul 29 00:42:37 2013 -0400

----------------------------------------------------------------------
 src/java/org/apache/cassandra/cli/CliClient.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/605c640a/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index 458fa53..cf1f7de 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -470,7 +470,6 @@ public class CliClient
 
         byte[] superColumnName = null;
         byte[] columnName = null;
-        boolean isSuper = cfDef.column_type.equals("Super");
 
         if ((columnSpecCnt < 0) || (columnSpecCnt > 2))
         {
@@ -496,7 +495,7 @@ public class CliClient
                                       ? convertValueByFunction(columnTree, null, null).array()
                                       : columnNameAsByteArray(CliCompiler.getColumn(columnFamilySpec,
0), cfDef);
 
-
+            boolean isSuper = cfDef.column_type.equals("Super");
             if (isSuper)
                 superColumnName = columnNameBytes;
             else
@@ -2044,7 +2043,6 @@ public class CliClient
         try
         {
             AuthenticationRequest authRequest;
-            Map<String, String> credentials = new HashMap<String, String>();
 
             keySpaceName = CliCompiler.getKeySpace(keySpaceName, thriftClient.describe_keyspaces());
 
@@ -2052,6 +2050,7 @@ public class CliClient
 
             if (username != null && password != null)
             {
+                Map<String, String> credentials = new HashMap<String, String>();
                 /* remove quotes */
                 password = password.replace("\'", "");
                 credentials.put(IAuthenticator.USERNAME_KEY, username);


Mime
View raw message