You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2016/11/30 14:24:07 UTC
[1/2] activemq-artemis git commit: Fix openwire tests due to missing
RoutingType
Repository: activemq-artemis
Updated Branches:
refs/heads/ARTEMIS-780 b661fb190 -> ca8636b68
Fix openwire tests due to missing RoutingType
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/4043049b
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/4043049b
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/4043049b
Branch: refs/heads/ARTEMIS-780
Commit: 4043049be578de4520d4038d1ff26ea953437c12
Parents: b661fb1
Author: Howard Gao <ho...@gmail.com>
Authored: Wed Nov 30 15:42:57 2016 +0800
Committer: jbertram <jb...@apache.com>
Committed: Wed Nov 30 08:23:40 2016 -0600
----------------------------------------------------------------------
.../artemis/core/protocol/openwire/OpenWireConnection.java | 3 ++-
.../activemq/artemis/core/protocol/openwire/amq/AMQSession.java | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4043049b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
index bd4b120..8fbc5b1 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/OpenWireConnection.java
@@ -35,6 +35,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.ActiveMQBuffer;
import org.apache.activemq.artemis.api.core.ActiveMQException;
import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException;
@@ -720,7 +721,7 @@ public class OpenWireConnection extends AbstractRemotingConnection implements Se
CheckType checkType = dest.isTemporary() ? CheckType.CREATE_NON_DURABLE_QUEUE : CheckType.CREATE_DURABLE_QUEUE;
server.getSecurityStore().check(qName, checkType, this);
server.checkQueueCreationLimit(getUsername());
- server.createQueue(qName, null, qName, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), true, false);
+ server.createQueue(qName, ActiveMQDefaultConfiguration.DEFAULT_ROUTING_TYPE, qName, connInfo == null ? null : SimpleString.toSimpleString(connInfo.getUserName()), true, false);
}
}
}
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/4043049b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
index 67870b6..a92a379 100644
--- a/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
+++ b/artemis-protocols/artemis-openwire-protocol/src/main/java/org/apache/activemq/artemis/core/protocol/openwire/amq/AMQSession.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.core.paging.PagingStore;
import org.apache.activemq.artemis.core.postoffice.RoutingStatus;
@@ -172,7 +173,7 @@ public class AMQSession implements SessionCallback {
if (!queueBinding.isExists()) {
if (isAutoCreate) {
- server.createQueue(queueName, null, queueName, null, true, isTemporary);
+ server.createQueue(queueName, ActiveMQDefaultConfiguration.DEFAULT_ROUTING_TYPE, queueName, null, true, isTemporary);
connection.addKnownDestination(queueName);
} else {
hasQueue = false;
[2/2] activemq-artemis git commit: Fix SimpleOpenWireTest
Posted by jb...@apache.org.
Fix SimpleOpenWireTest
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/ca8636b6
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/ca8636b6
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/ca8636b6
Branch: refs/heads/ARTEMIS-780
Commit: ca8636b68b7ede21b2b8d274b66f56739546448c
Parents: 4043049
Author: jbertram <jb...@apache.com>
Authored: Wed Nov 30 08:19:32 2016 -0600
Committer: jbertram <jb...@apache.com>
Committed: Wed Nov 30 08:23:41 2016 -0600
----------------------------------------------------------------------
.../artemis/tests/integration/openwire/SimpleOpenWireTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/ca8636b6/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
----------------------------------------------------------------------
diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
index be037ee..21d1fac 100644
--- a/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
+++ b/tests/integration-tests/src/test/java/org/apache/activemq/artemis/tests/integration/openwire/SimpleOpenWireTest.java
@@ -47,6 +47,7 @@ import org.apache.activemq.artemis.api.core.SimpleString;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.core.postoffice.PostOffice;
import org.apache.activemq.artemis.core.postoffice.impl.LocalQueueBinding;
+import org.apache.activemq.artemis.core.server.RoutingType;
import org.apache.activemq.artemis.core.settings.impl.AddressSettings;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.command.ActiveMQTopic;
@@ -690,7 +691,7 @@ public class SimpleOpenWireTest extends BasicOpenWireTest {
Connection conn1 = null;
SimpleString durableQueue = new SimpleString("exampleQueue");
- this.server.createQueue(durableQueue, durableQueue, null, true, false);
+ this.server.createQueue(durableQueue, RoutingType.ANYCAST, durableQueue, null, true, false);
Queue queue = ActiveMQJMSClient.createQueue("exampleQueue");