SpringCloud/spring-cloud-function
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove workaround for SPR issue (there are other ways)

Browse Source
This commit is contained in:
Dave Syer
2018-10-09 17:10:10 +01:00
parent ea38827739
commit ca0cc7da49
1 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
spring-cloud-function-context/src/main/java/org/springframework/cloud/function/context/config/ContextFunctionCatalogInitializer.java
View File

@@ -41,6 +41,7 @@ import org.springframework.context.support.GenericApplicationContext;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
import org.springframework.format.support.DefaultFormattingConversionService; import org.springframework.format.support.DefaultFormattingConversionService;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
/** /**
* @author Dave Syer * @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;
}
}
}
}
} }