Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARTEMIS-780 Check for HDR_ROUTING_TYPE in PostOffice

This commit is contained in:
Martyn Taylor 2016-12-09 10:09:38 +00:00 committed by Clebert Suconic
parent 4487f3e50a
commit 8655d1a3d8
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServerSessionImpl.java
View File

@ -1502,7 +1502,9 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
}
@Override
public SimpleString getMatchingQueue(SimpleString address, SimpleString queueName, RoutingType routingType) throws Exception {
public SimpleString getMatchingQueue(SimpleString address,
SimpleString queueName,
RoutingType routingType) throws Exception {
return server.getPostOffice().getMatchingQueue(address, queueName, routingType);
}
@ -1663,7 +1665,15 @@ public class ServerSessionImpl implements ServerSession, FailureListener {
final boolean noAutoCreateQueue) throws Exception {
RoutingStatus result = RoutingStatus.OK;
Pair<SimpleString, RoutingType> art = getAddressAndRoutingType(msg.getAddress(), null);
/**
* TODO Checking message properties on each message is expensive. Instead we should update the API and Core Packets
* to add the RoutingType information directly.
*/
RoutingType routingType = null;
if (msg.containsProperty(Message.HDR_ROUTING_TYPE)) {
routingType = RoutingType.getType(msg.getByteProperty(Message.HDR_ROUTING_TYPE));
}
Pair<SimpleString, RoutingType> art = getAddressAndRoutingType(msg.getAddress(), routingType);
// Consumer
// check the user has write access to this address.