From 12b96915c3e37edc1ea6b584ebc406f44426d4ec Mon Sep 17 00:00:00 2001
From: Dave Brosius <dbrosius@mebigfatguy.com>
Date: Sat, 27 Dec 2014 15:18:59 -0500
Subject: [PATCH] move null guard to where it's useful

---
 .../hadoop/cql3/CqlRecordWriter.java          | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index ff1989d7fd..702cae3d9e 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@ -104,23 +104,27 @@ class CqlRecordWriter extends AbstractColumnFamilyRecordWriter<Map<String, ByteB
         try
         {
             Cassandra.Client client = ConfigHelper.getClientFromOutputAddressList(conf);
-            client.set_keyspace(ConfigHelper.getOutputKeyspace(conf));
-            String user = ConfigHelper.getOutputKeyspaceUserName(conf);
-            String password = ConfigHelper.getOutputKeyspacePassword(conf);
-            if ((user != null) && (password != null))
-                AbstractColumnFamilyOutputFormat.login(user, password, client);
-            retrievePartitionKeyValidator(client);
-            String cqlQuery = CqlConfigHelper.getOutputCql(conf).trim();
-            if (cqlQuery.toLowerCase().startsWith("insert"))
-                throw new UnsupportedOperationException("INSERT with CqlRecordWriter is not supported, please use UPDATE/DELETE statement");
-            cql = appendKeyWhereClauses(cqlQuery);
-
             if (client != null)
             {
+                client.set_keyspace(ConfigHelper.getOutputKeyspace(conf));
+                String user = ConfigHelper.getOutputKeyspaceUserName(conf);
+                String password = ConfigHelper.getOutputKeyspacePassword(conf);
+                if ((user != null) && (password != null))
+                    AbstractColumnFamilyOutputFormat.login(user, password, client);
+                retrievePartitionKeyValidator(client);
+                String cqlQuery = CqlConfigHelper.getOutputCql(conf).trim();
+                if (cqlQuery.toLowerCase().startsWith("insert"))
+                    throw new UnsupportedOperationException("INSERT with CqlRecordWriter is not supported, please use UPDATE/DELETE statement");
+                cql = appendKeyWhereClauses(cqlQuery);
+
                 TTransport transport = client.getOutputProtocol().getTransport();
                 if (transport.isOpen())
                     transport.close();
             }
+            else
+            {
+                throw new IllegalArgumentException("Invalid configuration specified " + conf);
+            }
         }
         catch (Exception e)
         {