add IRE for invalid CF supplied to get_count patch by Lyuben Todorov; reviewed by jbellis for CASSANDRA-5701
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7bf14648 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7bf14648 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7bf14648 Branch: refs/heads/trunk Commit: 7bf14648ee6ed344acc0afe68e23d0b484826b24 Parents: 9c17189 Author: lyubent <ltodo...@dundee.ac.uk> Authored: Fri Dec 20 13:11:31 2013 +0200 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Fri Dec 20 14:39:36 2013 -0600 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/thrift/CassandraServer.java | 5 +++++ 2 files changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bf14648/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 60f86c3..67036c5 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.4 + * add IRE for invalid CF supplied to get_count (CASSANDRA-5701) * add client encryption support to sstableloader (CASSANDRA-6378) * Fix accept() loop for SSL sockets post-shutdown (CASSANDRA-6468) * Fix size-tiered compaction in LCS L0 (CASSANDRA-6496) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7bf14648/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 07c271b..beaae78 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -561,6 +561,11 @@ public class CassandraServer implements Cassandra.Iface pageSize, timestamp); } + catch (IllegalArgumentException e) + { + // CASSANDRA-5701 + throw new InvalidRequestException(e.getMessage()); + } catch (RequestExecutionException e) { throw ThriftConversion.rethrow(e);