Repository: activemq-artemis Updated Branches: refs/heads/master c40823e5e -> 26f987b69
ARTEMIS-1031 Fix prefix support Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/6b2363e0 Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/6b2363e0 Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/6b2363e0 Branch: refs/heads/master Commit: 6b2363e02e0f803916a528bb88039e80a0b9a6f0 Parents: c40823e Author: Martyn Taylor <[email protected]> Authored: Fri Mar 10 17:35:51 2017 +0000 Committer: Clebert Suconic <[email protected]> Committed: Fri Mar 10 15:38:02 2017 -0500 ---------------------------------------------------------------------- .../artemis/core/server/impl/ServerSessionImpl.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/6b2363e0/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 97187e7..08464e6 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 @@ -38,6 +38,7 @@ import org.apache.activemq.artemis.api.core.ActiveMQIllegalStateException; import org.apache.activemq.artemis.api.core.ActiveMQNonExistentQueueException; import org.apache.activemq.artemis.api.core.Message; import org.apache.activemq.artemis.api.core.Pair; +import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.api.core.SimpleString; import org.apache.activemq.artemis.api.core.client.ClientSession; import org.apache.activemq.artemis.api.core.management.CoreNotificationType; @@ -69,9 +70,7 @@ import org.apache.activemq.artemis.core.server.MessageReference; import org.apache.activemq.artemis.core.server.Queue; import org.apache.activemq.artemis.core.server.QueueQueryResult; import org.apache.activemq.artemis.core.server.RoutingContext; -import org.apache.activemq.artemis.api.core.RoutingType; import org.apache.activemq.artemis.core.server.ServerConsumer; - import org.apache.activemq.artemis.core.server.ServerSession; import org.apache.activemq.artemis.core.server.TempQueueObserver; import org.apache.activemq.artemis.core.server.management.ManagementService; @@ -1311,14 +1310,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { message.putStringProperty(Message.HDR_VALIDATED_USER, SimpleString.toSimpleString(validatedUser)); } - SimpleString originalAddress = message.getAddressSimpleString(); - - SimpleString address = removePrefix(message.getAddressSimpleString()); - - // In case the prefix was removed, we also need to update the message - if (address != message.getAddressSimpleString()) { - message.setAddress(address); - } + SimpleString address = message.getAddressSimpleString(); if (defaultAddress == null && address != null) { defaultAddress = address; @@ -1343,7 +1335,7 @@ public class ServerSessionImpl implements ServerSession, FailureListener { handleManagementMessage(tx, message, direct); } else { - result = doSend(tx, message, originalAddress, direct, noAutoCreateQueue); + result = doSend(tx, message, address, direct, noAutoCreateQueue); } return result; }
