activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dej...@apache.org
Subject activemq git commit: https://issues.apache.org/jira/browse/AMQ-5697 - adding acl fields as some plugins can use those directly instead of setting roles
Date Mon, 25 May 2015 11:24:45 GMT
Repository: activemq
Updated Branches:
  refs/heads/master 13b915ad1 -> ea2746b12


https://issues.apache.org/jira/browse/AMQ-5697 - adding acl fields as some plugins can use
those directly instead of setting roles


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

Branch: refs/heads/master
Commit: ea2746b121131b62f670457e49bfd83198608668
Parents: 13b915a
Author: Dejan Bosanac <dejan@nighttale.net>
Authored: Mon May 25 13:24:21 2015 +0200
Committer: Dejan Bosanac <dejan@nighttale.net>
Committed: Mon May 25 13:24:36 2015 +0200

----------------------------------------------------------------------
 .../org/apache/activemq/security/AuthorizationEntry.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/ea2746b1/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
index 777c8a8..37f07ba 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/security/AuthorizationEntry.java
@@ -119,9 +119,12 @@ public class AuthorizationEntry extends DestinationMapEntry {
 
         AuthorizationEntry that = (AuthorizationEntry) o;
 
+        if (adminACLs != null ? !adminACLs.equals(that.adminACLs) : that.adminACLs != null)
return false;
         if (adminRoles != null ? !adminRoles.equals(that.adminRoles) : that.adminRoles !=
null) return false;
         if (groupClass != null ? !groupClass.equals(that.groupClass) : that.groupClass !=
null) return false;
+        if (readACLs != null ? !readACLs.equals(that.readACLs) : that.readACLs != null) return
false;
         if (readRoles != null ? !readRoles.equals(that.readRoles) : that.readRoles != null)
return false;
+        if (writeACLs != null ? !writeACLs.equals(that.writeACLs) : that.writeACLs != null)
return false;
         if (writeRoles != null ? !writeRoles.equals(that.writeRoles) : that.writeRoles !=
null) return false;
 
         return true;
@@ -129,7 +132,10 @@ public class AuthorizationEntry extends DestinationMapEntry {
 
     @Override
     public int hashCode() {
-        int result = adminRoles != null ? adminRoles.hashCode() : 0;
+        int result = readACLs != null ? readACLs.hashCode() : 0;
+        result = 31 * result + (writeACLs != null ? writeACLs.hashCode() : 0);
+        result = 31 * result + (adminACLs != null ? adminACLs.hashCode() : 0);
+        result = 31 * result + (adminRoles != null ? adminRoles.hashCode() : 0);
         result = 31 * result + (readRoles != null ? readRoles.hashCode() : 0);
         result = 31 * result + (writeRoles != null ? writeRoles.hashCode() : 0);
         result = 31 * result + (groupClass != null ? groupClass.hashCode() : 0);


Mime
View raw message