You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ra...@apache.org on 2013/10/07 19:35:00 UTC
svn commit: r1530007 - in /qpid/trunk/qpid/java/client/src:
main/java/org/apache/qpid/client/message/
test/java/org/apache/qpid/client/message/
Author: rajith
Date: Mon Oct 7 17:35:00 2013
New Revision: 1530007
URL: http://svn.apache.org/r1530007
Log:
QPID-5204 Modified the code to return qpid.subject even when renamed to
JMS_qpid_subject. Modified the test case to handle the changes.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java?rev=1530007&r1=1530006&r2=1530007&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java Mon Oct 7 17:35:00 2013
@@ -746,7 +746,7 @@ public class AMQMessageDelegate_0_10 ext
}
else if (isStrictJMS && QpidMessageProperties.QPID_SUBJECT.equals(propertyName))
{
- return (String)getApplicationHeaders().get("JMS_" + QpidMessageProperties.QPID_SUBJECT);
+ return (String)getApplicationHeaders().get("JMS_" + QpidMessageProperties.QPID_SUBJECT_JMS_PROPER);
}
else
{
Modified: qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java?rev=1530007&r1=1530006&r2=1530007&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java (original)
+++ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java Mon Oct 7 17:35:00 2013
@@ -30,6 +30,7 @@ public class QpidMessageProperties
}
public static final String QPID_SUBJECT = "qpid.subject";
+ public static final String QPID_SUBJECT_JMS_PROPER = "qpid_subject";
// AMQP 0-10 related properties
public static final String AMQP_0_10_APP_ID = "x-amqp-0-10.app-id";
Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java?rev=1530007&r1=1530006&r2=1530007&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10Test.java Mon Oct 7 17:35:00 2013
@@ -124,7 +124,7 @@ public class AMQMessageDelegate_0_10Test
for (Enumeration props = delegate.getPropertyNames(); props.hasMoreElements();)
{
String key = (String)props.nextElement();
- if (key.equals("JMS_" + QpidMessageProperties.QPID_SUBJECT))
+ if (key.equals("JMS_" + QpidMessageProperties.QPID_SUBJECT_JMS_PROPER))
{
propFound = true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org