You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ma...@apache.org on 2016/12/01 15:48:51 UTC
[1/2] activemq-artemis git commit: checkstyle
Repository: activemq-artemis
Updated Branches:
refs/heads/ARTEMIS-780 a33a047d4 -> b3acd1622
checkstyle
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/baa95aa4
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/baa95aa4
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/baa95aa4
Branch: refs/heads/ARTEMIS-780
Commit: baa95aa4c1fd1b2a51d2021fd3fe2806ed47c1df
Parents: a33a047
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Dec 1 15:46:51 2016 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Dec 1 15:46:51 2016 +0000
----------------------------------------------------------------------
.../integration/addressing/AnycastTest.java | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/baa95aa4/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java
index bc39d05..9208386 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/addressing/AnycastTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.tests.integration.addressing;
+import java.util.concurrent.TimeUnit;
+
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.core.TransportConfiguration;
import org.apache.activemq.artemis.api.core.client.ActiveMQClient;
@@ -34,8 +36,6 @@ import org.apache.activemq.artemis.utils.TimeUtils;
import org.junit.Before;
import org.junit.Test;
-import java.util.concurrent.TimeUnit;
-
public class AnycastTest extends ActiveMQTestBase {
private SimpleString baseAddress = new SimpleString("anycast.address");
@@ -88,10 +88,10 @@ public class AnycastTest extends ActiveMQTestBase {
assertNull(consumer2.receive(200));
session.commit();
- assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num/2 == q1.getMessageCount()));
- assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num/2 == q2.getMessageCount()));
+ assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num / 2 == q1.getMessageCount()));
+ assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num / 2 == q2.getMessageCount()));
- ClientConsumer[] consumers = new ClientConsumer[] {consumer1, consumer2};
+ ClientConsumer[] consumers = new ClientConsumer[]{consumer1, consumer2};
for (int i = 0; i < consumers.length; i++) {
for (int j = 0; j < num / 2; j++) {
@@ -136,8 +136,8 @@ public class AnycastTest extends ActiveMQTestBase {
session.commit();
session.close();
- assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num/2 == q1.getMessageCount()));
- assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num/2 == q2.getMessageCount()));
+ assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num / 2 == q1.getMessageCount()));
+ assertTrue(TimeUtils.waitOnBoolean(true, 2000, () -> num / 2 == q2.getMessageCount()));
ClientSession session1 = sessionFactory.createSession(false, false);
ClientSession session2 = sessionFactory.createSession(false, false);
@@ -147,9 +147,9 @@ public class AnycastTest extends ActiveMQTestBase {
consumer1 = session1.createConsumer(q1.getName());
consumer2 = session2.createConsumer(q2.getName());
- ClientConsumer[] consumers = new ClientConsumer[] {consumer1, consumer2};
- ClientSession[] sessions = new ClientSession[] {session1, session2};
- Queue[] queues = new Queue[] {q1, q2};
+ ClientConsumer[] consumers = new ClientConsumer[]{consumer1, consumer2};
+ ClientSession[] sessions = new ClientSession[]{session1, session2};
+ Queue[] queues = new Queue[]{q1, q2};
for (int i = 0; i < consumers.length; i++) {
[2/2] activemq-artemis git commit: Ensure AddressInfo record is
created on autoCreate
Posted by ma...@apache.org.
Ensure AddressInfo record is created on autoCreate
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/b3acd162
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/b3acd162
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/b3acd162
Branch: refs/heads/ARTEMIS-780
Commit: b3acd1622bd659860b0decb51052fcdbe4fa9e7d
Parents: baa95aa
Author: Martyn Taylor <mt...@redhat.com>
Authored: Thu Dec 1 15:47:06 2016 +0000
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Thu Dec 1 15:47:06 2016 +0000
----------------------------------------------------------------------
.../activemq/artemis/core/server/impl/ActiveMQServerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/b3acd162/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
index 7f103e7..013bced 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ActiveMQServerImpl.java
@@ -2407,7 +2407,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
if (info == null) {
if (autoCreateAddress) {
- postOffice.addAddressInfo(defaultAddressInfo.setAutoCreated(true));
+ createAddressInfo(defaultAddressInfo.setAutoCreated(true));
addressAlreadyExists = false;
} else {
throw ActiveMQMessageBundle.BUNDLE.addressDoesNotExist(addressName);
@@ -2420,7 +2420,7 @@ public class ActiveMQServerImpl implements ActiveMQServer {
AddressInfo addressInfo = postOffice.getAddressInfo(queue.getAddress());
if (addressInfo == null) {
- postOffice.addAddressInfo(new AddressInfo(queue.getAddress()));
+ createAddressInfo(new AddressInfo(queue.getAddress()));
} else {
if (!addressInfo.getRoutingTypes().contains(routingType)) {
throw ActiveMQMessageBundle.BUNDLE.invalidRoutingTypeForAddress(routingType, addressInfo.getName().toString(), addressInfo.getRoutingTypes());