From b38a65cdbc08759b477f8ed5e2d29812939e281b Mon Sep 17 00:00:00 2001
From: Marius Bogoevici <mbogoevici@pivotal.io>
Date: Sun, 19 Feb 2017 14:09:39 -0500
Subject: [PATCH] AbstractMessageChannelBinder can have a `null` headers list

Fix #812
---
 .../cloud/stream/binder/AbstractMessageChannelBinder.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
index 067f44b2f..a79191c39 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/AbstractMessageChannelBinder.java
@@ -82,7 +82,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 	public AbstractMessageChannelBinder(boolean supportsHeadersNatively, String[] headersToEmbed,
 										PP provisioningProvider) {
 		this.supportsHeadersNatively = supportsHeadersNatively;
-		this.headersToEmbed = headersToEmbed;
+		this.headersToEmbed = headersToEmbed == null ? new String[0] : headersToEmbed;
 		this.provisioningProvider = provisioningProvider;
 	}