archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8188052: JNI FindClass needs to specify the class loading context used for library lifecycle hooks

Browse source 
Reviewed-by: alanb, coleenp, dholmes
This commit is contained in:
Mandy Chung 2017-10-10 11:52:42 -07:00
parent 42a29333b9
commit 4c1297b778
8 changed files with 27 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2381,7 +2381,7 @@ public abstract class ClassLoader {
private int jniVersion;
// the class from which the library is loaded, also indicates
// the loader this native library belongs.
private final Class<?> fromClass;
private Class<?> fromClass;
// the canonicalized name of the native library.
// or static library name
String name;
@ -2404,6 +2404,8 @@ public abstract class ClassLoader {
protected void finalize() {
synchronized (loadedLibraryNames) {
if (fromClass.getClassLoader() != null && loaded) {
this.fromClass = null; // no context when unloaded
/* remove the native library name */
int size = loadedLibraryNames.size();
for (int i = 0; i < size; i++) {

1
src/java.base/share/native/include/jni.h
View file

@ -1964,6 +1964,7 @@ JNI_OnUnload(JavaVM *vm, void *reserved);
#define JNI_VERSION_1_6 0x00010006
#define JNI_VERSION_1_8 0x00010008
#define JNI_VERSION_9 0x00090000
#define JNI_VERSION_10 0x000a0000
#ifdef __cplusplus
} /* extern "C" */