From 57f6c3e0abf44e105905422a408639f485751cc6 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Wed, 27 Jul 2011 16:38:27 -0400
Subject: [PATCH] avoiding NPE in AmqpOutboundEndpoint

---
 .../integration/amqp/outbound/AmqpOutboundEndpoint.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java
index acecf083f7..5539b9d832 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java
@@ -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)