summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
index 506860d2a1..fcc21428e9 100644
--- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
+++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
@@ -167,6 +167,9 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
AMQShortString routingKey;
boolean redelivered = false;
Struct[] headers = {message.getMessageProperties(), message.getDeliveryProperties()};
+ if (headers[0] == null) {
+ headers[0] = new MessageProperties();
+ }
if( message.getDeliveryProperties() != null )
{
exchange = new AMQShortString(message.getDeliveryProperties().getExchange());
@@ -190,7 +193,7 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By
getSession().getAMQConnection().exceptionReceived(e);
}
// if there is a replyto destination then we need to request the exchange info
- ReplyTo replyTo = message.getMessageProperties().getReplyTo();
+ ReplyTo replyTo = ((MessageProperties) headers[0]).getReplyTo();
if (replyTo != null && replyTo.getExchange() != null && !replyTo.getExchange().equals(""))
{
// <exch_class>://<exch_name>/[<destination>]/[<queue>]?<option>='<value>'[,<option>='<value>']*