cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/3] cassandra git commit: Fix existence check in CassandraRoleManager
Date Fri, 05 Jun 2015 12:26:48 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-2.2 24a1a5d71 -> 76cbddebc
  refs/heads/trunk 706b3b804 -> 0149e3424


Fix existence check in CassandraRoleManager


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/76cbddeb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/76cbddeb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/76cbddeb

Branch: refs/heads/cassandra-2.2
Commit: 76cbddebc7c8cd8bc944c0631cce326da9396a90
Parents: 24a1a5d
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Jun 5 10:32:42 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Jun 5 13:21:22 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                  | 1 +
 src/java/org/apache/cassandra/auth/CassandraRoleManager.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cbddeb/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9aadeff..f66efda 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.2
+ * Fix comparison bug in CassandraRoleManager#collectRoles (CASSANDRA-9551)
  * Add tinyint,smallint,time,date support for UDFs (CASSANDRA-9400)
  * Deprecates SSTableSimpleWriter and SSTableSimpleUnsortedWriter (CASSANDRA-9546)
  * Empty INITCOND treated as null in aggregate (CASSANDRA-9457)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/76cbddeb/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
index 261631d..802ae3c 100644
--- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
+++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java
@@ -43,7 +43,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
 import org.mindrot.jbcrypt.BCrypt;
 
 /**
- * Responsible for the creation, maintainance and delation of roles
+ * Responsible for the creation, maintenance and deletion of roles
  * for the purposes of authentication and authorization.
  * Role data is stored internally, using the roles and role_members tables
  * in the system_auth keyspace.
@@ -65,7 +65,7 @@ import org.mindrot.jbcrypt.BCrypt;
  * extends CassandraRoleManager and which includes Option.PASSWORD in the Set<Option>
  * returned from supportedOptions/alterableOptions. Any additional processing
  * of the password itself (such as storing it in an alternative location) would
- * be added in overriden createRole and alterRole implementations.
+ * be added in overridden createRole and alterRole implementations.
  */
 public class CassandraRoleManager implements IRoleManager
 {
@@ -437,7 +437,7 @@ public class CassandraRoleManager implements IRoleManager
         for (String memberOf : role.memberOf)
         {
             Role granted = getRole(memberOf);
-            if (role.equals(NULL_ROLE))
+            if (granted.equals(NULL_ROLE))
                 continue;
             collected.add(RoleResource.role(granted.name));
             if (includeInherited)


Mime
View raw message