You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2013/06/18 17:18:46 UTC
git commit: Fix PermissionDetails.equals() method
Updated Branches:
refs/heads/cassandra-1.2 df063449a -> 08878e90a
Fix PermissionDetails.equals() method
patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-5655
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/08878e90
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/08878e90
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/08878e90
Branch: refs/heads/cassandra-1.2
Commit: 08878e90abdf774315fe8580d87611f2eaa416c2
Parents: df06344
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Tue Jun 18 18:17:58 2013 +0300
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Tue Jun 18 18:17:58 2013 +0300
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/auth/PermissionDetails.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/08878e90/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0d42c13..c48eb7d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -28,6 +28,7 @@
* Fix message spelling errors for cql select statements (CASSANDRA-5647)
* Suppress custom exceptions thru jmx (CASSANDRA-5652)
* Update CREATE CUSTOM INDEX syntax (CASSANDRA-5639)
+ * Fix PermissionDetails.equals() method (CASSANDRA-5655)
Merged from 1.1:
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Fix NPE in Pig's widerow mode (CASSANDRA-5488)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/08878e90/src/java/org/apache/cassandra/auth/PermissionDetails.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/auth/PermissionDetails.java b/src/java/org/apache/cassandra/auth/PermissionDetails.java
index 52a8712..c13ec4b 100644
--- a/src/java/org/apache/cassandra/auth/PermissionDetails.java
+++ b/src/java/org/apache/cassandra/auth/PermissionDetails.java
@@ -59,7 +59,16 @@ public class PermissionDetails implements Comparable<PermissionDetails>
@Override
public boolean equals(Object o)
{
- return Objects.equal(this, o);
+ if (this == o)
+ return true;
+
+ if (!(o instanceof PermissionDetails))
+ return false;
+
+ PermissionDetails pd = (PermissionDetails) o;
+ return Objects.equal(this.username, pd.username)
+ && Objects.equal(this.resource, pd.resource)
+ && Objects.equal(this.permission, pd.permission);
}
@Override