Updated Branches:
  refs/heads/cassandra-2.0 3a4d6beb4 -> dc71d2200
  refs/heads/trunk 2d6ab6fb5 -> 82c0094a8


fix build


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

Branch: refs/heads/cassandra-2.0
Commit: dc71d2200339f9cf781346afc4b95b60dd3cd88f
Parents: 3a4d6be
Author: Brandon Williams <brandonwilli...@apache.org>
Authored: Tue Nov 5 15:33:49 2013 -0600
Committer: Brandon Williams <brandonwilli...@apache.org>
Committed: Tue Nov 5 15:33:49 2013 -0600

----------------------------------------------------------------------
 .../cassandra/hadoop/AbstractColumnFamilyInputFormat.java   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/dc71d220/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 274e43f..7876b62 100644
--- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyInputFormat.java
@@ -95,9 +95,12 @@ public abstract class AbstractColumnFamilyInputFormat<K, Y> 
extends InputFormat<
     {
         logger.debug("Creating authenticated client for CF input format");
         TTransport transport;
-        try {
-            transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port, 
conf);
-        } catch (Exception e) {
+        try
+        {
+            transport = 
ConfigHelper.getClientTransportFactory(conf).openTransport(location, port);
+        }
+        catch (Exception e)
+        {
             throw new TTransportException("Failed to open a transport to " + 
location + ":" + port + ".", e);
         }
         TProtocol binaryProtocol = new TBinaryProtocol(transport, true, true);

Reply via email to