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.1 Commit: 541a20dbb2ef258705c0632cddc3361ea533995c Parents: 820f0eb Author: Jonathan Ellis <jbel...@apache.org> Authored: Wed May 14 09:55:55 2014 -0700 Committer: Jonathan Ellis <jbel...@apache.org> 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<Long, Row> { if (session != null) session.close(); + if (cluster != null) + cluster.close(); } public Long getCurrentKey()
