From 492246eb137e4ddf875e34ca04acee0b6aa734aa Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 31 May 2017 12:10:27 -0400
Subject: [PATCH] Fix NPE (Mock Message with no Headers)

---
 .../integration/gateway/MessagingGatewayTests.java              | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java
index 319648dfc6..77180db506 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java
@@ -21,6 +21,7 @@ import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.mockito.Mockito.mock;
 
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -71,6 +72,7 @@ public class MessagingGatewayTests {
 		this.messagingGateway.afterPropertiesSet();
 		this.messagingGateway.start();
 		applicationContext.refresh();
+		Mockito.when(this.messageMock.getHeaders()).thenReturn(new MessageHeaders(Collections.emptyMap()));
 	}