From cbfd8195419cbb984b7cf93284fec316573d563b Mon Sep 17 00:00:00 2001 From: jbertram Date: Wed, 4 May 2016 13:02:09 -0500 Subject: [PATCH 1/2] ARTEMIS-512 fix variable name conflict --- .../artemis/core/config/impl/ConfigurationImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 bedfa56de0..19ef7da96e 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> getSecurityRoles() { for (SecuritySettingPlugin securitySettingPlugin : securitySettingPlugins) { - Map> securitySettings = securitySettingPlugin.getSecurityRoles(); - if (securitySettings != null) { - securitySettings.putAll(securitySettings); + Map> settings = securitySettingPlugin.getSecurityRoles(); + if (settings != null) { + securitySettings.putAll(settings); } } return securitySettings; From 9accf6275388890a81751ee466acba508ebfface Mon Sep 17 00:00:00 2001 From: jbertram Date: Wed, 4 May 2016 13:34:43 -0500 Subject: [PATCH 2/2] Fix LargeMessageOverReplicationTest It's not necessary to prefix the queue name with "jms.queue." when creating a queue with a JMS session. --- .../tests/extras/byteman/LargeMessageOverReplicationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java index beb8b201a9..75ba5dc4c6 100644 --- a/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java +++ b/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java @@ -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); }