Repository: cassandra Updated Branches: refs/heads/trunk 8d4478ba2 -> 87cb1c6e8
better exception message Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/87cb1c6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/87cb1c6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/87cb1c6e Branch: refs/heads/trunk Commit: 87cb1c6e8705ae359bb58e1a73c793a31992366f Parents: 8d4478b Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Oct 1 16:09:11 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Oct 1 16:09:11 2016 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/CFMetaData.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/87cb1c6e/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 53959c0..065b759 100644 --- a/src/java/org/apache/cassandra/config/CFMetaData.java +++ b/src/java/org/apache/cassandra/config/CFMetaData.java @@ -804,9 +804,8 @@ public final class CFMetaData if (!cfm.cfId.equals(cfId)) throw new ConfigurationException(String.format("Column family ID mismatch (found %s; expected %s)", cfm.cfId, cfId)); - if (!cfm.flags.equals(flags)) - throw new ConfigurationException("types do not match."); + throw new ConfigurationException(String.format("Column family type mismatch (found %s; expected %s)", cfm.flags, flags)); if (!cfm.comparator.isCompatibleWith(comparator)) throw new ConfigurationException(String.format("Column family comparators do not match or are not compatible (found %s; expected %s).", cfm.comparator.toString(), comparator.toString()));
