You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2008/05/05 17:40:50 UTC
svn commit: r653508 -
/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Author: gsim
Date: Mon May 5 08:40:50 2008
New Revision: 653508
URL: http://svn.apache.org/viewvc?rev=653508&view=rev
Log:
QPID-1008: allow for case where 0-10 message-properties are not included in a received message
Modified:
incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
Modified: incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java?rev=653508&r1=653507&r2=653508&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java (original)
+++ incubator/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java Mon May 5 08:40:50 2008
@@ -167,6 +167,9 @@
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 @@
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>']*