Repository: activemq-artemis Updated Branches: refs/heads/master e458a4327 -> a7c80fbf9
ARTEMIS-512 fix variable name conflict Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/cbfd8195 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/cbfd8195 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/cbfd8195 Branch: refs/heads/master Commit: cbfd8195419cbb984b7cf93284fec316573d563b Parents: e458a43 Author: jbertram <[email protected]> Authored: Wed May 4 13:02:09 2016 -0500 Committer: jbertram <[email protected]> Committed: Wed May 4 13:04:10 2016 -0500 ---------------------------------------------------------------------- .../activemq/artemis/core/config/impl/ConfigurationImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/cbfd8195/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java index bedfa56..19ef7da 100644 --- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java +++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java @@ -1151,9 +1151,9 @@ public class ConfigurationImpl implements Configuration, Serializable { @Override public Map<String, Set<Role>> getSecurityRoles() { for (SecuritySettingPlugin securitySettingPlugin : securitySettingPlugins) { - Map<String, Set<Role>> securitySettings = securitySettingPlugin.getSecurityRoles(); - if (securitySettings != null) { - securitySettings.putAll(securitySettings); + Map<String, Set<Role>> settings = securitySettingPlugin.getSecurityRoles(); + if (settings != null) { + securitySettings.putAll(settings); } } return securitySettings;
