Return-Path: X-Original-To: apmail-cassandra-commits-archive@www.apache.org Delivered-To: apmail-cassandra-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6B79410C55 for ; Tue, 5 Nov 2013 21:35:37 +0000 (UTC) Received: (qmail 95054 invoked by uid 500); 5 Nov 2013 21:35:37 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 95028 invoked by uid 500); 5 Nov 2013 21:35:37 -0000 Mailing-List: contact commits-help@cassandra.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cassandra.apache.org Delivered-To: mailing list commits@cassandra.apache.org Received: (qmail 95020 invoked by uid 99); 5 Nov 2013 21:35:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Nov 2013 21:35:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 019D545751; Tue, 5 Nov 2013 21:35:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: brandonwilliams@apache.org To: commits@cassandra.apache.org Date: Tue, 05 Nov 2013 21:35:36 -0000 Message-Id: <82d7569479f24f9192ae031928d5d3c2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/3] git commit: fix build 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 Authored: Tue Nov 5 15:33:49 2013 -0600 Committer: Brandon Williams 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 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);