From 86be5e1b78454ff445567badaa3e6bf20bb481e6 Mon Sep 17 00:00:00 2001
From: Kevin Eustice <eustice@gmail.com>
Date: Fri, 12 Jul 2013 11:14:25 -0700
Subject: [PATCH] INTEXT-81 Fixing bug in decoding message streams * adding a
 null check on the key decoder

https://jira.springsource.org/browse/INTEXT-81
---
 .../integration/kafka/support/ConsumerConfiguration.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java
index 047ba70..0e77998 100644
--- a/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java
+++ b/spring-integration-kafka/src/main/java/org/springframework/integration/kafka/support/ConsumerConfiguration.java
@@ -182,10 +182,11 @@ public class ConsumerConfiguration {
 
 	@SuppressWarnings("unchecked")
 	public Map<String, List<KafkaStream<byte[], byte[]>>> getConsumerMapWithMessageStreams() {
-		if (consumerMetadata.getValueDecoder() != null) {
+		if (consumerMetadata.getValueDecoder() != null &&
+		    consumerMetadata.getKeyDecoder()   != null) {
 			return getConsumerConnector().createMessageStreams(
 					consumerMetadata.getTopicStreamMap(),
-					consumerMetadata.getValueDecoder(),
+					consumerMetadata.getKeyDecoder(),
 					consumerMetadata.getValueDecoder());
 		}