diff options
| author | Gordon Sim <gsim@apache.org> | 2008-05-05 15:40:50 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-05-05 15:40:50 +0000 |
| commit | 049865f2890569eea6d94ec7e942298958b30071 (patch) | |
| tree | 22763ebdcf574dbfa66f85af1f9898fec3d51665 /qpid/java/client | |
| parent | b045e2d7fd45ccd9096365db7101adbfdc87e7ab (diff) | |
| download | qpid-python-049865f2890569eea6d94ec7e942298958b30071.tar.gz | |
QPID-1008: allow for case where 0-10 message-properties are not included in a received message
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@653508 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/client')
| -rw-r--r-- | qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java b/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java index 506860d2a1..fcc21428e9 100644 --- a/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java +++ b/qpid/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>']* |