This is an automated email from the ASF dual-hosted git repository. mck pushed a commit to branch cassandra-2.2 in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/cassandra-2.2 by this push: new f05bf64 Fix 2.2 eclipse-warnings f05bf64 is described below commit f05bf64fc1606beeba5b26ffdb63207fec549238 Author: Mick Semb Wever <m...@apache.org> AuthorDate: Thu Nov 14 15:33:36 2019 +0100 Fix 2.2 eclipse-warnings patch by Mick Semb Wever; reviewed by Benedict for CASSANDRA-15427 --- src/java/org/apache/cassandra/db/compaction/CompactionManager.java | 1 + .../apache/cassandra/db/compaction/LeveledCompactionStrategy.java | 1 + src/java/org/apache/cassandra/tools/SSTableExport.java | 7 +------ 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java index bd34b1f..46f0acf 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@ -844,6 +844,7 @@ public class CompactionManager implements CompactionManagerMBean * * @throws IOException */ + @SuppressWarnings("resource") private void doCleanupOne(final ColumnFamilyStore cfs, LifecycleTransaction txn, CleanupStrategy cleanupStrategy, Collection<Range<Token>> ranges, boolean hasIndexes) throws IOException { assert !cfs.isIndex(); diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index bdc9141..6daea36 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@ -215,6 +215,7 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy return maxSSTableSizeInMB * 1024L * 1024L; } + @SuppressWarnings("resource") public ScannerList getScanners(Collection<SSTableReader> sstables, Range<Token> range) { Set<SSTableReader>[] sstablesPerLevel = manifest.getSStablesPerLevelSnapshot(); diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java index 58070e6..50d6611 100644 --- a/src/java/org/apache/cassandra/tools/SSTableExport.java +++ b/src/java/org/apache/cassandra/tools/SSTableExport.java @@ -312,8 +312,7 @@ public class SSTableExport excludeSet = new HashSet<>(Arrays.asList(excludes)); SSTableIdentityIterator row; - ISSTableScanner scanner = reader.getScanner(); - try + try (ISSTableScanner scanner = reader.getScanner()) { outs.println("["); @@ -340,10 +339,6 @@ public class SSTableExport outs.println("\n]"); outs.flush(); } - finally - { - scanner.close(); - } } /** --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org