You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/03/15 11:01:47 UTC
[2/3] qpid-broker-j git commit: QPID-8113 : Incorrect symbolic
descriptor used for (JMS) selector filter
QPID-8113 : Incorrect symbolic descriptor used for (JMS) selector filter
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/1b860ff9
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/1b860ff9
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/1b860ff9
Branch: refs/heads/7.0.x
Commit: 1b860ff935b0384fd36d7b366e9a0b901f66dcf2
Parents: 0e95681
Author: rgodfrey <rg...@apache.org>
Authored: Wed Feb 28 14:42:51 2018 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Thu Mar 15 10:27:41 2018 +0000
----------------------------------------------------------------------
.../type/messaging/codec/JMSSelectorFilterConstructor.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/1b860ff9/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
index a5a1227..96ea008 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/type/messaging/codec/JMSSelectorFilterConstructor.java
@@ -35,8 +35,10 @@ public class JMSSelectorFilterConstructor extends AbstractDescribedTypeConstruct
{
private static final Object[] DESCRIPTORS =
{
- Symbol.valueOf("apache.org:jms-selector-filter:string"),
- UnsignedLong.valueOf(0x0000468C00000004L)
+ Symbol.valueOf("apache.org:selector-filter:string"),
+ UnsignedLong.valueOf(0x0000468C00000004L),
+ // This incorrect value was originally specified here - retaining solely for backwards compatibility
+ Symbol.valueOf("apache.org:jms-selector-filter:string")
};
private static final JMSSelectorFilterConstructor INSTANCE = new JMSSelectorFilterConstructor();
@@ -60,7 +62,7 @@ public class JMSSelectorFilterConstructor extends AbstractDescribedTypeConstruct
}
else
{
- final String msg = String.format("Cannot decode 'apache.org:jms-selector-filter' from '%s'",
+ final String msg = String.format("Cannot decode 'apache.org:selector-filter' from '%s'",
underlying == null ? null : underlying.getClass().getSimpleName());
throw new AmqpErrorException(AmqpError.DECODE_ERROR, msg);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org