activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbert...@apache.org
Subject [1/2] activemq-artemis git commit: Fix openwire tests due to missing RoutingType
Date Wed, 30 Nov 2016 14:24:07 GMT
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 <howard.gao@gmail.com>
Authored: Wed Nov 30 15:42:57 2016 +0800
Committer: jbertram <jbertram@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;


Mime
View raw message