Repository: cassandra Updated Branches: refs/heads/trunk 52430b93e -> 260163994
ninja fix to resource leak (CASSANDRA-10708) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/26016399 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/26016399 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/26016399 Branch: refs/heads/trunk Commit: 260163994e4ac71fafb0578cb143ab4f0f22d6ad Parents: 52430b9 Author: Yuki Morishita <yu...@apache.org> Authored: Tue Dec 29 11:35:10 2015 -0600 Committer: Yuki Morishita <yu...@apache.org> Committed: Tue Dec 29 11:35:10 2015 -0600 ---------------------------------------------------------------------- .../org/apache/cassandra/db/compaction/CompactionManager.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/26016399/src/java/org/apache/cassandra/db/compaction/CompactionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index cfffa14..571088b 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -644,15 +644,14 @@ public class CompactionManager implements CompactionManagerMBean return; } - if(sstable == null) + if (sstable == null) { logger.warn("Will not clean {}, it is not an active sstable", entry.getValue()); } else { - LifecycleTransaction txn = cfs.getTracker().tryModify(sstable, OperationType.CLEANUP); CleanupStrategy cleanupStrategy = CleanupStrategy.get(cfs, ranges, FBUtilities.nowInSeconds()); - try + try (LifecycleTransaction txn = cfs.getTracker().tryModify(sstable, OperationType.CLEANUP)) { doCleanupOne(cfs, txn, cleanupStrategy, ranges, hasIndexes); }
