Browse Source

Merge branch '1.4.x' into 1.5.x

pull/7387/head
Andy Wilkinson 9 years ago
parent
commit
3a2d9e31ff
  1. 13
      spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java

13
spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java

@ -27,6 +27,7 @@ import java.util.Enumeration; @@ -27,6 +27,7 @@ import java.util.Enumeration;
import java.util.jar.JarFile;
import org.springframework.boot.loader.jar.Handler;
import org.springframework.lang.UsesJava7;
/**
* {@link ClassLoader} used by the {@link Launcher}.
@ -38,7 +39,7 @@ import org.springframework.boot.loader.jar.Handler; @@ -38,7 +39,7 @@ import org.springframework.boot.loader.jar.Handler;
public class LaunchedURLClassLoader extends URLClassLoader {
static {
ClassLoader.registerAsParallelCapable();
performParallelCapableRegistration();
}
/**
@ -186,4 +187,14 @@ public class LaunchedURLClassLoader extends URLClassLoader { @@ -186,4 +187,14 @@ public class LaunchedURLClassLoader extends URLClassLoader {
}
}
@UsesJava7
private static void performParallelCapableRegistration() {
try {
ClassLoader.registerAsParallelCapable();
}
catch (NoSuchMethodError ex) {
// Running on Java 6. Continue.
}
}
}

Loading…
Cancel
Save