qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rob...@apache.org
Subject svn commit: r1664568 - in /qpid/branches/0.32/qpid/java: ./ broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
Date Fri, 06 Mar 2015 09:23:07 GMT
Author: robbie
Date: Fri Mar  6 09:23:06 2015
New Revision: 1664568

URL: http://svn.apache.org/r1664568
Log:
QPID-6432: when looking for the JMSType value use the message Subject first if present

merge from trunk r1664114

Modified:
    qpid/branches/0.32/qpid/java/   (props changed)
    qpid/branches/0.32/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java

Propchange: qpid/branches/0.32/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar  6 09:23:06 2015
@@ -9,4 +9,4 @@
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
 /qpid/trunk/qpid:796646-796653
-/qpid/trunk/qpid/java:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664160,1664309,1664334
+/qpid/trunk/qpid/java:1661079,1661142,1661162,1661165-1661166,1661207,1661212,1661364,1661368,1661373,1661530-1661531,1661693,1661741,1661929,1662051,1662473,1662489,1662683,1664114,1664160,1664309,1664334

Modified: qpid/branches/0.32/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.32/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java?rev=1664568&r1=1664567&r2=1664568&view=diff
==============================================================================
--- qpid/branches/0.32/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
(original)
+++ qpid/branches/0.32/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/MessageMetaData_1_0.java
Fri Mar  6 09:23:06 2015
@@ -493,7 +493,13 @@ public class MessageMetaData_1_0 impleme
 
         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;



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message