Apache/activemq-artemis
1
0
Fork 0
mirror of https://github.com/apache/activemq-artemis.git synced 2025-02-23 02:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-512 fix variable name conflict

Browse Source
This commit is contained in:
jbertram 2016-05-04 13:02:09 -05:00
parent e458a4327c
commit cbfd819541
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/config/impl/ConfigurationImpl.java
View File

@ -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;