Author: arnaudsimon
Date: Thu Jan 17 06:06:17 2008
New Revision: 612821
URL: http://svn.apache.org/viewvc?rev=612821&view=rev
Log:
see qpid-743
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=612821&r1=612820&r2=612821&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
Thu Jan 17 06:06:17 2008
@@ -169,9 +169,22 @@
int channelId = getSession().getChannelId();
long deliveryId = message.getMessageTransferId();
String consumerTag = getConsumerTag().toString();
- AMQShortString exchange = new
AMQShortString(message.getDeliveryProperties().getExchange());
- AMQShortString routingKey = new
AMQShortString(message.getDeliveryProperties().getRoutingKey());
- boolean redelivered = message.getDeliveryProperties().getRedelivered();
+ AMQShortString exchange;
+ AMQShortString routingKey;
+ boolean redelivered = false;
+ Struct[] headers = {message.getMessageProperties(),
message.getDeliveryProperties()};
+ if( message.getDeliveryProperties() != null )
+ {
+ exchange = new
AMQShortString(message.getDeliveryProperties().getExchange());
+ routingKey = new
AMQShortString(message.getDeliveryProperties().getRoutingKey());
+ redelivered = message.getDeliveryProperties().getRedelivered();
+ }
+ else
+ {
+ exchange = new AMQShortString("");
+ routingKey = new AMQShortString("");
+ headers[1] = new DeliveryProperties();
+ }
UnprocessedMessage_0_10 newMessage =
new UnprocessedMessage_0_10(channelId, deliveryId,
consumerTag, exchange, routingKey, redelivered);
try
@@ -182,7 +195,6 @@
{
getSession().getAMQConnection().exceptionReceived(e);
}
- Struct[] headers = {message.getMessageProperties(),
message.getDeliveryProperties()};
// if there is a replyto destination then we need to request the
exchange info
ReplyTo replyTo = message.getMessageProperties().getReplyTo();
if (replyTo != null && replyTo.getExchangeName() != null &&
!replyTo.getExchangeName().equals(""))
