archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8281000: ClassLoader::registerAsParallelCapable throws NPE if caller is null

Browse source 
Reviewed-by: erikj, ihse, mchung, bchristi
This commit is contained in:
Tim Prinzing 2022-02-17 17:34:39 +00:00 • committed by Mandy Chung
parent 4c7f8b49a4
commit a6f8a386ef
5 changed files with 216 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/java.base/share/classes/java/lang/ClassLoader.java
View file

@ -1606,9 +1606,16 @@ public abstract class ClassLoader {
* </ol>
* <p>Note that once a class loader is registered as parallel capable, there
* is no way to change it back.</p>
* <p>
* In cases where this method is called from a context where the caller is
* not a subclass of {@code ClassLoader} or there is no caller frame on the
* stack (e.g. when called directly from a JNI attached thread),
* {@code IllegalCallerException} is thrown.
* </p>
*
* @return {@code true} if the caller is successfully registered as
* parallel capable and {@code false} if otherwise.
* @throws IllegalCallerException if the caller is not a subclass of {@code ClassLoader}
*
* @see #isRegisteredAsParallelCapable()
*
@ -1622,6 +1629,9 @@ public abstract class ClassLoader {
// Caller-sensitive adapter method for reflective invocation
@CallerSensitiveAdapter
private static boolean registerAsParallelCapable(Class<?> caller) {
if ((caller == null) || !ClassLoader.class.isAssignableFrom(caller)) {
throw new IllegalCallerException(caller + " not a subclass of ClassLoader");
}
return ParallelLoaders.register(caller.asSubclass(ClassLoader.class));
}