From 0be20e2b41eebfe42cbe36c52c744dbaa33074d5 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Mon, 7 Dec 2009 15:17:18 +0000 Subject: QPID-2242 : Fixed 0-10 code path's getJMSDestination() updated JMSDestinationTest to cover more test cases: - Recieving a msg via Queue,Topic - Recieving a msg via Queue with a MessageListener - Recieving a msg on a queue that was sent to a topic, requires JMX interface to perform message move. Excluded test from 0-8 profile until the problem has been resolved git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@887948 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/qpid/client/BasicMessageConsumer.java | 2 +- .../java/org/apache/qpid/client/message/AMQMessageDelegate_0_10.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'qpid/java/client/src') diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java index 667785c441..bea43cc232 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java +++ b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java @@ -784,11 +784,11 @@ public abstract class BasicMessageConsumer extends Closeable implements Messa break; } + } void postDeliver(AbstractJMSMessage msg) throws JMSException { - msg.setJMSDestination(_destination); switch (_acknowledgeMode) { 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 338aefbd4a..ffd6e2a13c 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 @@ -171,6 +171,11 @@ public class AMQMessageDelegate_0_10 implements AMQMessageDelegate _deliveryTag = deliveryTag; _readableProperties = (_messageProps != null); + AMQDestination dest; + + dest = generateDestination(new AMQShortString(_deliveryProps.getExchange()), + new AMQShortString(_deliveryProps.getRoutingKey())); + setJMSDestination(dest); } -- cgit v1.2.1