Repository: cassandra Updated Branches: refs/heads/trunk b6868fbb8 -> 7bd577375
move condition (ifile != null) to where it has some value as it is already checked for in validateSummarySamplingLevel() Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bd57737 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bd57737 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bd57737 Branch: refs/heads/trunk Commit: 7bd577375ca5b661eb1fdb92954363546e864655 Parents: b6868fb Author: Dave Brosius <[email protected]> Authored: Sat Dec 26 22:24:30 2015 -0500 Committer: Dave Brosius <[email protected]> Committed: Sat Dec 26 22:24:30 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bd57737/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java index 4031304..1dafea3 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableReader.java @@ -737,7 +737,7 @@ public abstract class SSTableReader extends SSTable implements SelfRefCounted<SS // Check for an index summary that was downsampled even though the serialization format doesn't support // that. If it was downsampled, rebuild it. See CASSANDRA-8993 for details. - if (!descriptor.version.hasSamplingLevel() && !builtSummary && !validateSummarySamplingLevel() && ifile != null) + if (ifile != null && !descriptor.version.hasSamplingLevel() && !builtSummary && !validateSummarySamplingLevel()) { indexSummary.close(); ifile.close();
