From 671f4452b2207171fee99536971d8a075b60d7ad Mon Sep 17 00:00:00 2001 From: Robert Gemmell Date: Fri, 6 Mar 2015 09:23:06 +0000 Subject: QPID-6432: when looking for the JMSType value use the message Subject first if present merge from trunk r1664114 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.32@1664568 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java index fbc24ba454..6800b14d65 100755 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java @@ -493,7 +493,13 @@ public class MessageMetaData_1_0 implements StorableMessageMetaData public String getType() { + String subject = getSubject(); + if(subject != null) + { + return subject; + } + // Use legacy annotation if present and there was no subject if(_messageAnnotations == null || _messageAnnotations.get(JMS_TYPE) == null) { return null; -- cgit v1.2.1