Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 c1eb74ce4 -> c3550fe40
Fix CFMetaData#getColumnDefinitionFromColumnName() patch by Sergio Bossa; reviewed by Aleksey Yeschenko for CASSANDRA-7047 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c3550fe4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c3550fe4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c3550fe4 Branch: refs/heads/cassandra-2.0 Commit: c3550fe40c298bb7d31735ac1aedfc9fab84c169 Parents: c1eb74c Author: Sergio Bossa <sergio.bo...@gmail.com> Authored: Thu Apr 24 01:56:51 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Apr 24 01:56:51 2014 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/config/CFMetaData.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3550fe4/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 68c335d..8b1ed54 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,7 @@ * USING TIMESTAMP for batches does not work (CASSANDRA-7053) * Fix performance regression from CASSANDRA-5614 (CASSANDRA-6949) * Merge groupable mutations in TriggerExecutor#execute() (CASSANDRA-7047) + * Fix CFMetaData#getColumnDefinitionFromColumnName() (CASSANDRA-7074) Merged from 1.2: * Fix batchlog to account for CF truncation records (CASSANDRA-6999) * Fix CQLSH parsing of functions and BLOB literals (CASSANDRA-7018) http://git-wip-us.apache.org/repos/asf/cassandra/blob/c3550fe4/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java index be18d1b..23f912e 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -1219,7 +1219,7 @@ public final class CFMetaData else { if (def.componentIndex >= components.length) - break; + continue; toCompare = components[def.componentIndex]; }
