activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tmie...@apache.org
Subject [1/3] git commit: https://issues.apache.org/jira/browse/AMQ-5304 - still missing unit test case
Date Thu, 07 Aug 2014 12:10:14 GMT
Repository: activemq
Updated Branches:
  refs/heads/trunk f1f1233cf -> 8fb690f17


https://issues.apache.org/jira/browse/AMQ-5304 - still missing unit test case


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

Branch: refs/heads/trunk
Commit: 98f707bd1e733821a02e13b6ae0fe9bc8a0ed9b0
Parents: 0d9eedc
Author: Torsten Mielke <tmielke@redhat.com>
Authored: Fri Aug 1 15:18:46 2014 +0200
Committer: Torsten Mielke <tmielke@redhat.com>
Committed: Thu Aug 7 10:55:04 2014 +0200

----------------------------------------------------------------------
 .../security/TempDestinationAuthorizationEntry.java    | 13 +++++++++++++
 .../activemq/security/XBeanAuthorizationMap.java       |  5 +++++
 2 files changed, 18 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq/blob/98f707bd/activemq-broker/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
----------------------------------------------------------------------
diff --git a/activemq-broker/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
b/activemq-broker/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
index 8f6a68a..fe19e56 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/security/TempDestinationAuthorizationEntry.java
@@ -30,6 +30,19 @@ public class TempDestinationAuthorizationEntry extends AuthorizationEntry
{
         // we don't need to check if destination is specified since
         // the TempDestinationAuthorizationEntry should map to all temp
         // destinations
+
+
+        if (adminRoles != null) {
+            setAdminACLs(parseACLs(adminRoles));
+        }
+
+        if (writeRoles != null) {
+            setWriteACLs(parseACLs(writeRoles));
+        }
+
+        if (readRoles != null) {
+            setReadACLs(parseACLs(readRoles));
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/activemq/blob/98f707bd/activemq-spring/src/main/java/org/apache/activemq/security/XBeanAuthorizationMap.java
----------------------------------------------------------------------
diff --git a/activemq-spring/src/main/java/org/apache/activemq/security/XBeanAuthorizationMap.java
b/activemq-spring/src/main/java/org/apache/activemq/security/XBeanAuthorizationMap.java
index c8b71e5..8d43efb 100644
--- a/activemq-spring/src/main/java/org/apache/activemq/security/XBeanAuthorizationMap.java
+++ b/activemq-spring/src/main/java/org/apache/activemq/security/XBeanAuthorizationMap.java
@@ -57,6 +57,11 @@ public class XBeanAuthorizationMap extends DefaultAuthorizationMap implements
In
             }
             ((XBeanAuthorizationEntry)entry).afterPropertiesSet();
         }
+
+        // also check group class of temp destination ACL
+        if (getTempDestinationAuthorizationEntry() != null && getTempDestinationAuthorizationEntry().getGroupClass()
!= null) {
+            getTempDestinationAuthorizationEntry().afterPropertiesSet();
+        }
         super.setEntries(authorizationEntries);
     }
 


Mime
View raw message