From 593b8c38cab3af5b8367ede80b32d68b9c71fc65 Mon Sep 17 00:00:00 2001
From: Oleg Zhurakousky <ozhurakousky@pivotal.io>
Date: Mon, 27 Nov 2017 21:57:00 -0500
Subject: [PATCH] Fixed ClassLoader discovery logic in
 BinderFactoryConfiguration

---
 .../cloud/stream/config/BinderFactoryConfiguration.java       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java
index 12f329bde..0d055aaf0 100644
--- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java
+++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/config/BinderFactoryConfiguration.java
@@ -146,9 +146,7 @@ public class BinderFactoryConfiguration {
 	public BinderTypeRegistry binderTypeRegistry(ConfigurableApplicationContext configurableApplicationContext) {
 		Map<String, BinderType> binderTypes = new HashMap<>();
 		ClassLoader classLoader = configurableApplicationContext.getClassLoader();
-		if (classLoader == null) {
-			classLoader = BinderFactoryConfiguration.class.getClassLoader();
-		}
+		// the above can never be null since it will default to ClassUtils.getDefaultClassLoader(..)
 		try {
 			Enumeration<URL> resources = classLoader.getResources("META-INF/spring.binders");
 			if (!Boolean.valueOf(this.selfContained) && (resources == null || !resources.hasMoreElements())) {