Updated Branches: refs/heads/trunk 813577e32 -> 843e92c96
fix String.format parameter order for error string Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/843e92c9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/843e92c9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/843e92c9 Branch: refs/heads/trunk Commit: 843e92c96b0ce5a8418ba42bbef5a6c26750fe79 Parents: 813577e Author: Dave Brosius <dbros...@apache.org> Authored: Thu Jul 25 01:36:17 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Thu Jul 25 01:36:17 2013 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/thrift/ThriftValidation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/843e92c9/src/java/org/apache/cassandra/thrift/ThriftValidation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java index ce8fdcb..ec3bb00 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java +++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java @@ -235,8 +235,8 @@ public class ThriftValidation ByteBuffer[] components = composite.split(name); int minComponents = composite.types.size() - (cfDef.hasCollections ? 1 : 0); if (components.length < minComponents) - throw new org.apache.cassandra.exceptions.InvalidRequestException(String.format("Not enough component (found %d but %d expected) for column name since %s is a CQL3 table", - metadata.cfName, components.length, minComponents)); + throw new org.apache.cassandra.exceptions.InvalidRequestException(String.format("Not enough components (found %d but %d expected) for column name since %s is a CQL3 table", + components.length, minComponents, metadata.cfName)); // Furthermore, the column name must be a declared one. int columnIndex = composite.types.size() - (cfDef.hasCollections ? 2 : 1);
