Fix LogFile throws Exception when assertion is disabled patch by yukim; reviewed by carlyeks for CASSANDRA-10522
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a52597d8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a52597d8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a52597d8 Branch: refs/heads/cassandra-3.0 Commit: a52597d81396e09274ecf6d05ebbf0e24c259fc6 Parents: c3b2aed Author: Yuki Morishita <yu...@apache.org> Authored: Wed Oct 14 11:03:22 2015 -0500 Committer: Yuki Morishita <yu...@apache.org> Committed: Thu Oct 15 17:30:59 2015 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/db/lifecycle/LogFile.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a52597d8/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index fa74539..dcacc69 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 3.0-rc2 + * Fix LogFile throws Exception when assertion is disabled (CASSANDRA-10522) * Revert CASSANDRA-7486, make CMS default GC, move GC config to conf/jvm.options (CASSANDRA-10403) * Fix TeeingAppender causing some logs to be truncated/empty (CASSANDRA-10447) http://git-wip-us.apache.org/repos/asf/cassandra/blob/a52597d8/src/java/org/apache/cassandra/db/lifecycle/LogFile.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java index c698722..bff3724 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LogFile.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LogFile.java @@ -43,7 +43,8 @@ final class LogFile static LogFile make(File logFile, int folderDescriptor) { Matcher matcher = LogFile.FILE_REGEX.matcher(logFile.getName()); - assert matcher.matches() && matcher.groupCount() == 3; + boolean matched = matcher.matches(); + assert matched && matcher.groupCount() == 3; // For now we don't need this but it is there in case we need to change // file format later on, the version is the sstable version as defined in BigFormat
