You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by br...@apache.org on 2014/04/22 16:47:04 UTC
[07/10] git commit: Don't NPE when username is supplied but password
isn't.
Don't NPE when username is supplied but password isn't.
Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7050
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8b8042b0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8b8042b0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8b8042b0
Branch: refs/heads/trunk
Commit: 8b8042b032fd93103fa6c74fc4b751e0dd9a207b
Parents: 3dad8ca
Author: Brandon Williams <br...@apache.org>
Authored: Tue Apr 22 09:42:04 2014 -0500
Committer: Brandon Williams <br...@apache.org>
Committed: Tue Apr 22 09:42:04 2014 -0500
----------------------------------------------------------------------
.../apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java | 2 +-
.../apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
index 03b1576..73bc25c 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -103,7 +103,7 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> extends InputFormat<
// log in
client.set_keyspace(ConfigHelper.getInputKeyspace(conf));
- if (ConfigHelper.getInputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getInputKeyspaceUserName(conf) != null) && (ConfigHelper.getInputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getInputKeyspaceUserName(conf));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/8b8042b0/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
index 3041829..96ca65d 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyOutputFormat.java
@@ -124,7 +124,7 @@ public abstract class AbstractColumnFamilyOutputFormat<K, Y> extends OutputForma
TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);
Cassandra.Client client = new Cassandra.Client(binaryProtocol);
client.set_keyspace(ConfigHelper.getOutputKeyspace(conf));
- if (ConfigHelper.getOutputKeyspaceUserName(conf) != null)
+ if ((ConfigHelper.getOutputKeyspaceUserName(conf) != null) && (ConfigHelper.getOutputKeyspacePassword(conf) != null))
{
Map<String, String> creds = new HashMap<String, String>();
creds.put(IAuthenticator.USERNAME_KEY, ConfigHelper.getOutputKeyspaceUserName(conf));