avoiding NPE in AmqpOutboundEndpoint

This commit is contained in:
Mark Fisher
2011-07-27 16:38:27 -04:00
parent cd1c4b1c45
commit 57f6c3e0ab

View File

@@ -124,6 +124,9 @@ public class AmqpOutboundEndpoint extends AbstractReplyProducingMessageHandler {
this.headerMapper.fromHeaders(requestMessage.getHeaders(), amqpMessageProperties);
org.springframework.amqp.core.Message amqpMessage = converter.toMessage(requestMessage.getPayload(), amqpMessageProperties);
org.springframework.amqp.core.Message amqpReplyMessage = this.amqpTemplate.sendAndReceive(this.exchangeName, routingKey, amqpMessage);
if (amqpReplyMessage == null) {
return null;
}
Object replyObject = converter.fromMessage(amqpReplyMessage);
MessageBuilder<?> builder = (replyObject instanceof Message)
? MessageBuilder.fromMessage((Message<?>) replyObject)