You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2016/05/04 18:46:49 UTC
[1/3] activemq-artemis git commit: ARTEMIS-512 fix variable name
conflict
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 <jb...@apache.org>
Authored: Wed May 4 13:02:09 2016 -0500
Committer: jbertram <jb...@apache.org>
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;
[2/3] activemq-artemis git commit: Fix LargeMessageOverReplicationTest
Posted by cl...@apache.org.
Fix LargeMessageOverReplicationTest
It's not necessary to prefix the queue name with "jms.queue." when
creating a queue with a JMS session.
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/9accf627
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/9accf627
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/9accf627
Branch: refs/heads/master
Commit: 9accf6275388890a81751ee466acba508ebfface
Parents: cbfd819
Author: jbertram <jb...@apache.org>
Authored: Wed May 4 13:34:43 2016 -0500
Committer: jbertram <jb...@apache.org>
Committed: Wed May 4 13:44:56 2016 -0500
----------------------------------------------------------------------
.../tests/extras/byteman/LargeMessageOverReplicationTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/9accf627/tests/extra-tests/src/test/java/org/apache/activemq/artemis/tests/extras/byteman/LargeMessageOverReplicationTest.java
----------------------------------------------------------------------
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 beb8b20..75ba5dc 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);
}
[3/3] activemq-artemis git commit: This closes #503
Posted by cl...@apache.org.
This closes #503
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/a7c80fbf
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/a7c80fbf
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/a7c80fbf
Branch: refs/heads/master
Commit: a7c80fbf9d31d4af45a4021b2ed569facdc407f9
Parents: e458a43 9accf62
Author: Clebert Suconic <cl...@apache.org>
Authored: Wed May 4 14:45:22 2016 -0400
Committer: Clebert Suconic <cl...@apache.org>
Committed: Wed May 4 14:45:22 2016 -0400
----------------------------------------------------------------------
.../activemq/artemis/core/config/impl/ConfigurationImpl.java | 6 +++---
.../tests/extras/byteman/LargeMessageOverReplicationTest.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------