Commit 3a2d9e31 authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.4.x' into 1.5.x

parents e5762259 808185ab
......@@ -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;
public class LaunchedURLClassLoader extends URLClassLoader {
static {
ClassLoader.registerAsParallelCapable();
performParallelCapableRegistration();
}
/**
......@@ -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.
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment