diff options
Diffstat (limited to 'java/client/src/main')
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java | 5 | ||||
| -rw-r--r-- | java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java | 2 |
2 files changed, 5 insertions, 2 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 dbe01a96c6..08eba25d16 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 @@ -148,7 +148,10 @@ public class BasicMessageConsumer_0_10 extends BasicMessageConsumer<Struct[], By } Struct[] headers = {message.getMessageProperties(), message.getDeliveryProperties()}; // if there is a replyto destination then we need to request the exchange info - if (!message.getMessageProperties().getReplyTo().getExchangeName().equals("")) + ReplyTo replyTo = message.getMessageProperties().getReplyTo(); + if (replyTo != null && + replyTo.getExchangeName() != null && + !replyTo.getExchangeName().equals("")) { Future<ExchangeQueryResult> future = ((AMQSession_0_10) getSession()).getQpidSession() .exchangeQuery(message.getMessageProperties().getReplyTo().getExchangeName()); diff --git a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java index 9313149442..e037c3ed3e 100644 --- a/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java +++ b/java/client/src/main/java/org/apache/qpid/client/message/AbstractJMSMessageFactory.java @@ -127,7 +127,7 @@ public abstract class AbstractJMSMessageFactory implements MessageFactory props.setContentType(mprop.getContentType()); props.setCorrelationId(mprop.getCorrelationId()); String encoding = mprop.getContentEncoding(); - if (!encoding.equals("")) + if (encoding != null && !encoding.equals("")) { props.setEncoding(encoding); } |