From a48739e905ff1922eb11ac4682de61e23eb3a3eb Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Fri, 30 Mar 2018 16:57:04 -0400
Subject: [PATCH] GH-1332 Fixed ClassCastException

Removed casting to byte[] in SendingHandler.serializeAndEmbedHeadersIfApplicable(..)

Resolves #1332
---
 .../cloud/stream/binder/AbstractMessageChannelBinder.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 bda8c0725..a98c70318 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
@@ -729,7 +729,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 		@SuppressWarnings("deprecation")
 		private Message<?> serializeAndEmbedHeadersIfApplicable(Message<?> message) throws Exception {
 			MessageValues transformed = serializePayloadIfNecessary(message);
-			byte[] payload;
+			Object payload;
 			if (this.embedHeaders) {
 				Object contentType = transformed.get(MessageHeaders.CONTENT_TYPE);
 				// transform content type headers to String, so that they can be properly
@@ -744,7 +744,7 @@ public abstract class AbstractMessageChannelBinder<C extends ConsumerProperties,
 				payload = EmbeddedHeaderUtils.embedHeaders(transformed, this.embeddedHeaders);
 			}
 			else {
-				payload = (byte[]) transformed.getPayload();
+				payload = transformed.getPayload();
 			}
 			return getMessageBuilderFactory().withPayload(payload).copyHeaders(transformed.getHeaders()).build();
 		}