Repository: cassandra Updated Branches: refs/heads/trunk 9c6c072d9 -> ed538f90e
validate the version string, before trying to build a Version object from it Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ed538f90 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ed538f90 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ed538f90 Branch: refs/heads/trunk Commit: ed538f90efde68cda8571798d2a402e852fcba51 Parents: 9c6c072 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Wed Jun 15 23:12:32 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Wed Jun 15 23:12:32 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/io/sstable/Descriptor.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ed538f90/src/java/org/apache/cassandra/io/sstable/Descriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/Descriptor.java b/src/java/org/apache/cassandra/io/sstable/Descriptor.java index ff4abfc..7840985 100644 --- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java +++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java @@ -278,11 +278,12 @@ public class Descriptor // version nexttok = tokenStack.pop(); - Version version = fmt.info.getVersion(nexttok); - if (!version.validate(nexttok)) + if (!Version.validate(nexttok)) throw new UnsupportedOperationException("SSTable " + name + " is too old to open. Upgrade to 2.0 first, and run upgradesstables"); + Version version = fmt.info.getVersion(nexttok); + // ks/cf names String ksname, cfname; if (version.hasNewFileName())
