Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3842: Backport NPE Fix for the AmqpInGateway

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3842
This commit is contained in:
Artem Bilan
2015-10-07 10:57:16 -04:00
committed by Gary Russell
parent e06d9a697a
commit 750c3d1cd1
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java
View File

@@ -105,6 +105,8 @@ public class AmqpInboundGateway extends MessagingGatewaySupport {
// TODO: fallback to a reply address property of this gateway
Address replyTo;
String replyToProperty = message.getMessageProperties().getReplyTo();
Assert.notNull(replyToProperty, "The replyTo header must not be null on a " +
"request Message being handled by the AMQP inbound gateway.");
// TODO: Use the Address.AMQ_RABBITMQ_REPLY_TO constant when 1.4.3 is the minimum
if (replyToProperty.startsWith("amq.rabbitmq.reply-to")) {
replyTo = new Address("", replyToProperty);
@@ -112,8 +114,6 @@ public class AmqpInboundGateway extends MessagingGatewaySupport {
else {
replyTo = new Address(replyToProperty);
}
Assert.notNull(replyTo, "The replyTo header must not be null on a " +
"request Message being handled by the AMQP inbound gateway.");
amqpTemplate.convertAndSend(replyTo.getExchangeName(), replyTo.getRoutingKey(), reply.getPayload(),
new MessagePostProcessor() {