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

Merge branch '1.x'

Browse Source
This commit is contained in:
Dave Syer
2018-08-21 13:44:03 +01:00
parent 30187b583b 4a6227a777
commit 9803f4c61e
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-function-deployer/src/main/java/org/springframework/cloud/function/deployer/FunctionCreatorConfiguration.java
View File

@@ -244,11 +244,24 @@ class FunctionCreatorConfiguration {
private String defaultMain; private String defaultMain;
public BeanCreator(URL[] urls) { public BeanCreator(URL[] urls) {
functionClassLoader = new BeanCreatorClassLoader(expand(urls), functionClassLoader = new BeanCreatorClassLoader(expand(urls), getParent());
getClass().getClassLoader().getParent());
this.defaultMain = findMain(urls); this.defaultMain = findMain(urls);
} }
private ClassLoader getParent() {
ClassLoader loader = getClass().getClassLoader().getParent();
ClassLoader parent = loader;
while (loader.getParent() != null) {
// If launched from a fat jar with spring.factories skip this parent level
// (which was added by the JarLauncher).
if (loader.getResource("META-INF/spring.factories") != null) {
parent = loader.getParent();
}
loader = loader.getParent();
}
return parent;
}
private String findMain(URL[] urls) { private String findMain(URL[] urls) {
for (URL url : urls) { for (URL url : urls) {
try { try {