https://issues.apache.org/jira/browse/AMQ-5304 - applying groupClass to <tempDestinationAuthorizationEntry>
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/38b3140c Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/38b3140c Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/38b3140c Branch: refs/heads/activemq-5.10.x Commit: 38b3140cc0ff9fc9026ef76cc4a75fbb0bb98286 Parents: d8e3026 Author: Torsten Mielke <[email protected]> Authored: Thu Aug 7 11:08:38 2014 +0200 Committer: Hadrian Zbarcea <[email protected]> Committed: Wed Dec 17 16:47:35 2014 -0500 ---------------------------------------------------------------------- .../activemq/security/TempDestinationAuthorizationEntry.java | 6 ------ .../org/apache/activemq/security/XBeanAuthorizationMap.java | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/38b3140c/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 fe19e56..71f46f6 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 @@ -27,11 +27,6 @@ package org.apache.activemq.security; public class TempDestinationAuthorizationEntry extends AuthorizationEntry { public void afterPropertiesSet() throws Exception { - // 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)); } @@ -44,5 +39,4 @@ public class TempDestinationAuthorizationEntry extends AuthorizationEntry { setReadACLs(parseACLs(readRoles)); } } - } http://git-wip-us.apache.org/repos/asf/activemq/blob/38b3140c/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 8d43efb..08ca5b3 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 @@ -59,9 +59,15 @@ public class XBeanAuthorizationMap extends DefaultAuthorizationMap implements In } // also check group class of temp destination ACL - if (getTempDestinationAuthorizationEntry() != null && getTempDestinationAuthorizationEntry().getGroupClass() != null) { + // use the group class of the <authorizationMap> entry if this temp + // destination entry has no group class specified. + if (getTempDestinationAuthorizationEntry() != null) { + if (getTempDestinationAuthorizationEntry().getGroupClass() == null) { + getTempDestinationAuthorizationEntry().setGroupClass(groupClass); + } getTempDestinationAuthorizationEntry().afterPropertiesSet(); } + super.setEntries(authorizationEntries); }
