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 D0D0511985 for ; Wed, 14 May 2014 19:51:48 +0000 (UTC) Received: (qmail 8821 invoked by uid 500); 14 May 2014 17:01:47 -0000 Delivered-To: apmail-cassandra-commits-archive@cassandra.apache.org Received: (qmail 8762 invoked by uid 500); 14 May 2014 17:01:47 -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 8748 invoked by uid 99); 14 May 2014 17:01:47 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 May 2014 17:01:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 60EAD8C4A21; Wed, 14 May 2014 17:01:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: jbellis@apache.org To: commits@cassandra.apache.org Date: Wed, 14 May 2014 17:01:47 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: =?utf-8?q?=5B1/6=5D_git_commit=3A_Close_java_driver_Cluster_in_CQL?= =?utf-8?q?RR=2Eclose_patch_by_Mariusz_Kry=C5=84ski=3B_reviewed_by_jbellis_f?= =?utf-8?q?or_CASSANDRA-7228?= Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 820f0eb60 -> 541a20dbb refs/heads/cassandra-2.1 1927d5ec7 -> 8a5365ebd refs/heads/trunk b5671f08b -> 091db6482 Close java driver Cluster in CQLRR.close patch by Mariusz Kryński; reviewed by jbellis for CASSANDRA-7228 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/541a20db Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/541a20db Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/541a20db Branch: refs/heads/cassandra-2.0 Commit: 541a20dbb2ef258705c0632cddc3361ea533995c Parents: 820f0eb Author: Jonathan Ellis Authored: Wed May 14 09:55:55 2014 -0700 Committer: Jonathan Ellis Committed: Wed May 14 09:55:55 2014 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 58cebbd..9a43040 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.9 + * (Hadoop) Close java driver Cluster in CQLRR.close (CASSANDRA-7228) * Fix potential SlabAllocator yield-starvation (CASSANDRA-7133) * Warn when 'USING TIMESTAMP' is used on a CAS BATCH (CASSANDRA-7067) * Starting threads in OutboundTcpConnectionPool constructor causes race conditions (CASSANDRA-7177) http://git-wip-us.apache.org/repos/asf/cassandra/blob/541a20db/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index 62fa1c9..ff4f1e6 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java @@ -133,6 +133,8 @@ public class CqlRecordReader extends RecordReader { if (session != null) session.close(); + if (cluster != null) + cluster.close(); } public Long getCurrentKey()