From ca0cc7da4900eebcc85cb684b6dd8f58e28b7e10 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 9 Oct 2018 17:10:10 +0100 Subject: [PATCH] Remove workaround for SPR issue (there are other ways) --- .../ContextFunctionCatalogInitializer.java | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java index 7f23eb593..4d7fcd880 100644 --- a/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java +++ b/spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java @@ -41,6 +41,7 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.format.support.DefaultFormattingConversionService; import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; /** * @author Dave Syer @@ -220,25 +221,4 @@ public class ContextFunctionCatalogInitializer } - // https://jira.spring.io/browse/SPR-17333 - static class ClassUtils { - - public static boolean isPresent(String string, ClassLoader classLoader) { - if (classLoader == null) { - classLoader = ClassUtils.class.getClassLoader(); - } - try { - return Class.forName(string, false, classLoader) != null; - } - catch (Throwable e) { - try { - return Class.forName(string) != null; - } - catch (Throwable t) { - return false; - } - } - } - - } }