From b9884ae71a90bb65a5471d06ff1e716cf647c7e6 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Wed, 8 Nov 2017 10:16:52 -0500
Subject: [PATCH] Add comment to embedded header decode error log

---
 .../stream/binder/AbstractMessageChannelBinder.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 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 3914b2ed7..91ecc5e6e 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
@@ -283,7 +283,14 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 							messageValues = EmbeddedHeaderUtils.extractHeaders((Message<byte[]>) message, true);
 						}
 						catch (Exception e) {
-							logger.debug(EmbeddedHeaderUtils.decodeExceptionMessage(message),e);
+							/*
+							 * debug() rather then error() since we don't know for sure that it
+							 * really is a message with embedded headers, it just meets the
+							 * criteria in EmbeddedHeaderUtils.mayHaveEmbeddedHeaders().
+							 */
+							if (logger.isDebugEnabled()) {
+								logger.debug(EmbeddedHeaderUtils.decodeExceptionMessage(message),e);
+							}
 							messageValues = new MessageValues(message);
 						}
 						return messageValues.toMessage();