summaryrefslogtreecommitdiff
path: root/qpid/java/client/src/main
diff options
context:
space:
mode:
authorRajith Muditha Attapattu <rajith@apache.org>2013-10-07 17:35:00 +0000
committerRajith Muditha Attapattu <rajith@apache.org>2013-10-07 17:35:00 +0000
commit659d2e50da4634bb33bd3a39f5024a3fc6e2d57d (patch)
tree6fa595e9e547d8abefa2f16e10615c566cb3917b /qpid/java/client/src/main
parentddfd1f0cff14bfdc87706e5a6c95f9d8b27fd5b0 (diff)
downloadqpid-python-659d2e50da4634bb33bd3a39f5024a3fc6e2d57d.tar.gz
QPID-5204 Modified the code to return qpid.subject even when renamed to
JMS_qpid_subject. Modified the test case to handle the changes. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1530007 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client/src/main')
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java2
-rw-r--r--qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java1
2 files changed, 2 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
index 73f089e4c9..ea0319c9df 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java
@@ -746,7 +746,7 @@ public class AMQMessageDelegate_0_10 extends AbstractAMQMessageDelegate
}
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
{
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java b/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
index 663dfd39b1..21bb206349 100644
--- a/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
+++ b/qpid/java/client/src/main/java/org/apache/qpid/client/message/QpidMessageProperties.java
@@ -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";