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

https://issues.apache.org/jira/browse/AMQ-5560 

Check both the symbolic and numeric id values when searching filters.
This commit is contained in:
Timothy Bish 2015-03-05 14:01:06 -05:00
parent ace101a03a
commit aea771faf6
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
activemq-amqp/src/main/java/org/apache/activemq/transport/amqp/AmqpProtocolConverter.java
View File

@ -140,8 +140,12 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
private static final Symbol QUEUE_PREFIX = Symbol.valueOf("queue-prefix");
private static final Symbol TOPIC_PREFIX = Symbol.valueOf("topic-prefix");
private static final Symbol COPY = Symbol.getSymbol("copy");
private static final UnsignedLong JMS_SELECTOR = UnsignedLong.valueOf(0x0000468C00000004L);
private static final UnsignedLong NO_LOCAL = UnsignedLong.valueOf(0x0000468C00000003L);
private static final UnsignedLong JMS_SELECTOR_CODE = UnsignedLong.valueOf(0x0000468C00000004L);
private static final Symbol JMS_SELECTOR_NAME = Symbol.valueOf("apache.org:selector-filter:string");
private static final Object[] JMS_SELECTOR_FILTER_IDS = new Object[] { JMS_SELECTOR_CODE, JMS_SELECTOR_NAME };
private static final UnsignedLong NO_LOCAL_CODE = UnsignedLong.valueOf(0x0000468C00000003L);
private static final Symbol NO_LOCAL_NAME = Symbol.valueOf("apache.org:selector-filter:string");
private static final Object[] NO_LOCAL_FILTER_IDS = new Object[] { NO_LOCAL_CODE, NO_LOCAL_NAME };
private static final Symbol TEMP_QUEUE_CAPABILITY = Symbol.valueOf("temporary-queue");
private static final Symbol TEMP_TOPIC_CAPABILITY = Symbol.valueOf("temporary-topic");
@ -1414,7 +1418,7 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
String selector = null;
if (source != null) {
DescribedType filter = findFilter(source.getFilter(), JMS_SELECTOR);
DescribedType filter = findFilter(source.getFilter(), JMS_SELECTOR_FILTER_IDS);
if (filter != null) {
selector = filter.getDescribed().toString();
// Validate the Selector.
@ -1503,7 +1507,7 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
consumerInfo.setSubscriptionName(sender.getName());
}
DescribedType filter = findFilter(source.getFilter(), NO_LOCAL);
DescribedType filter = findFilter(source.getFilter(), NO_LOCAL_FILTER_IDS);
if (filter != null) {
consumerInfo.setNoLocal(true);
}
@ -1629,19 +1633,28 @@ class AmqpProtocolConverter implements IAmqpProtocolConverter {
return false;
}
private DescribedType findFilter(Map<Symbol, Object> filters, UnsignedLong filterId) {
private DescribedType findFilter(Map<Symbol, Object> filters, Object[] filterIds) {
if (filterIds == null || filterIds.length == 0) {
throw new IllegalArgumentException("Invliad Filter Ids array passed: " + filterIds);
}
if (filters == null || filters.isEmpty()) {
return null;
}
for (Object value : filters.values()) {
if (value instanceof DescribedType) {
DescribedType describedType = (DescribedType) value;
if (describedType.getDescriptor().equals(filterId)) {
DescribedType describedType = ((DescribedType) value);
Object descriptor = ((DescribedType) value).getDescriptor();
for (Object filterId : filterIds) {
if (descriptor.equals(filterId)) {
return describedType;
}
}
}
}
return null;
}