From 541a20dbb2ef258705c0632cddc3361ea533995c Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Wed, 14 May 2014 09:55:55 -0700 Subject: [PATCH] =?UTF-8?q?Close=20java=20driver=20Cluster=20in=20CQLRR.cl?= =?UTF-8?q?ose=20patch=20by=20Mariusz=20Kry=C5=84ski;=20reviewed=20by=20jb?= =?UTF-8?q?ellis=20for=20CASSANDRA-7228?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGES.txt | 1 + src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 58cebbdb5c..9a430401b0 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) diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java index 62fa1c9b9a..ff4f1e6697 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()