Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 1992598ec -> d1d10fae0
Avoid returning Permission.NONE when failing to query users table patch by Vishy Kasar; reviewed by Sankalp Kohli for CASSANDRA-10168 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/978660d9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/978660d9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/978660d9 Branch: refs/heads/cassandra-2.2 Commit: 978660d99806d4894fe360cf415e07abdaf8803a Parents: f5d0595 Author: Vishy Kasar <[email protected]> Authored: Tue Aug 25 12:41:44 2015 +0300 Committer: Aleksey Yeschenko <[email protected]> Committed: Tue Aug 25 12:45:10 2015 +0300 ---------------------------------------------------------------------- CHANGES.txt | 3 +-- src/java/org/apache/cassandra/auth/CassandraAuthorizer.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/978660d9/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 2d11d55..d6a0af9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,7 +1,6 @@ 2.1.9 * (cqlsh) default load-from-file encoding to utf-8 (CASSANDRA-9898) - * Avoid returning Permission.None when system_auth.permissions table does not - exist (CASSANDRA-10168) + * Avoid returning Permission.NONE when failing to query users table (CASSANDRA-10168) * (cqlsh) Allow encoding to be set through command line (CASSANDRA-10004) * Add new JMX methods to change local compaction strategy (CASSANDRA-9965) * Write hints for paxos commits (CASSANDRA-7342) http://git-wip-us.apache.org/repos/asf/cassandra/blob/978660d9/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java index 20060c0..49eefb1 100644 --- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java +++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java @@ -83,7 +83,7 @@ public class CassandraAuthorizer implements IAuthorizer catch (RequestExecutionException e) { logger.warn("CassandraAuthorizer failed to authorize {} for {}", user, resource); - return Permission.NONE; + throw new RuntimeException(e); } if (result.isEmpty() || !result.one().has(PERMISSIONS))
