Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This closes #503

This commit is contained in:
Clebert Suconic 2016-05-04 14:45:22 -04:00
parent e458a4327c 9accf62753
commit a7c80fbf9d
2 changed files with 4 additions and 4 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;

2
tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java
View File

@ -104,7 +104,7 @@ public class LargeMessageOverReplicationTest extends ActiveMQTestBase {
waitForRemoteBackup(connection.getSessionFactory(), 30);
session = connection.createSession(true, Session.SESSION_TRANSACTED);
queue = session.createQueue("jms.queue.Queue");
queue = session.createQueue("Queue");
producer = session.createProducer(queue);
}