activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From clebertsuco...@apache.org
Subject [17/17] activemq-artemis git commit: Fixing that will be needed from Martyn and Justin
Date Sun, 05 Mar 2017 16:50:18 GMT
Fixing that will be needed from Martyn and Justin


Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0a7eee6f
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0a7eee6f
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0a7eee6f

Branch: refs/heads/artemis-1009
Commit: 0a7eee6f56a2e402647808c91a04eab6277571df
Parents: 4894015
Author: Clebert Suconic <clebertsuconic@apache.org>
Authored: Sun Mar 5 11:34:19 2017 -0500
Committer: Clebert Suconic <clebertsuconic@apache.org>
Committed: Sun Mar 5 11:49:43 2017 -0500

----------------------------------------------------------------------
 .../activemq/artemis/protocol/amqp/broker/AMQPMessage.java     | 6 +++++-
 .../artemis/protocol/amqp/broker/AMQPSessionCallback.java      | 1 +
 .../activemq/artemis/core/server/impl/ServerSessionImpl.java   | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a7eee6f/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
index 40c041d..12218f8 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPMessage.java
@@ -189,6 +189,7 @@ public class AMQPMessage extends RefCountMessage {
    @Override
    public RoutingType getRouteType() {
 
+      /* TODO-now @Martyn or @Justin:
       switch (((Byte)type).byteValue()) {
          case AMQPMessageSupport.QUEUE_TYPE:
          case AMQPMessageSupport.TEMP_QUEUE_TYPE:
@@ -199,7 +200,10 @@ public class AMQPMessage extends RefCountMessage {
             return RoutingType.MULTICAST;
          default:
             return null;
-      }
+      } */
+
+
+      return null;
    }
 
 

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a7eee6f/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
----------------------------------------------------------------------
diff --git a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
index 5fc2209..5931afe 100644
--- a/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
+++ b/artemis-protocols/artemis-amqp-protocol/src/main/java/org/apache/activemq/artemis/protocol/amqp/broker/AMQPSessionCallback.java
@@ -40,6 +40,7 @@ import org.apache.activemq.artemis.core.server.impl.AddressInfo;
 import org.apache.activemq.artemis.core.server.impl.ServerConsumerImpl;
 import org.apache.activemq.artemis.core.transaction.Transaction;
 import org.apache.activemq.artemis.jms.client.ActiveMQConnection;
+import org.apache.activemq.artemis.protocol.amqp.converter.CoreAmqpConverter;
 import org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPException;
 import org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPInternalErrorException;
 import org.apache.activemq.artemis.protocol.amqp.exceptions.ActiveMQAMQPResourceLimitExceededException;

http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/0a7eee6f/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
----------------------------------------------------------------------
diff --git a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
index 1cd19bb..a85afe6 100644
--- a/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
+++ b/artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
@@ -1629,13 +1629,14 @@ public class ServerSessionImpl implements ServerSession, FailureListener
{
 
       RoutingType routingType = msg.getRouteType();
 
+      /* TODO-now: @Martyn or @Justin
       if (originalAddress != null) {
          if (originalAddress.toString().startsWith("anycast:")) {
             routingType = RoutingType.ANYCAST;
          } else if (originalAddress.toString().startsWith("multicast:")) {
             routingType = RoutingType.MULTICAST;
          }
-      }
+      } */
 
       Pair<SimpleString, RoutingType> art = getAddressAndRoutingType(msg.getAddressSimpleString(),
routingType);
 


Mime
View raw message