< prev index next >
src/java.base/share/native/libjava/ClassLoader.c
Print this page
@@ -258,11 +258,10 @@
}
}
static jfieldID handleID;
static jfieldID jniVersionID;
-static jfieldID loadedID;
static void *procHandle;
static jboolean initIDs(JNIEnv *env)
{
if (handleID == 0) {
@@ -274,13 +273,10 @@
if (handleID == 0)
return JNI_FALSE;
jniVersionID = (*env)->GetFieldID(env, this, "jniVersion", "I");
if (jniVersionID == 0)
return JNI_FALSE;
- loadedID = (*env)->GetFieldID(env, this, "loaded", "Z");
- if (loadedID == 0)
- return JNI_FALSE;
procHandle = getProcessHandle();
}
return JNI_TRUE;
}
@@ -333,28 +329,29 @@
return entryName;
}
/*
* Class: java_lang_ClassLoader_NativeLibrary
- * Method: load
- * Signature: (Ljava/lang/String;Z)V
+ * Method: load0
+ * Signature: (Ljava/lang/String;Z)Z
*/
-JNIEXPORT void JNICALL
-Java_java_lang_ClassLoader_00024NativeLibrary_load
+JNIEXPORT jboolean JNICALL
+Java_java_lang_ClassLoader_00024NativeLibrary_load0
(JNIEnv *env, jobject this, jstring name, jboolean isBuiltin)
{
const char *cname;
jint jniVersion;
jthrowable cause;
void * handle;
+ jboolean loaded = JNI_FALSE;
if (!initIDs(env))
- return;
+ return JNI_FALSE;
cname = JNU_GetStringPlatformChars(env, name, 0);
if (cname == 0)
- return;
+ return JNI_FALSE;
handle = isBuiltin ? procHandle : JVM_LoadLibrary(cname);
if (handle) {
JNI_OnLoad_t JNI_OnLoad;
JNI_OnLoad = (JNI_OnLoad_t)findJniFunction(env, handle,
isBuiltin ? cname : NULL,
@@ -398,24 +395,25 @@
(*env)->Throw(env, cause);
}
goto done;
}
(*env)->SetLongField(env, this, handleID, ptr_to_jlong(handle));
- (*env)->SetBooleanField(env, this, loadedID, JNI_TRUE);
+ loaded = JNI_TRUE;
done:
JNU_ReleaseStringPlatformChars(env, name, cname);
+ return loaded;
}
/*
* Class: java_lang_ClassLoader_NativeLibrary
* Method: unload
- * Signature: (Z)V
+ * Signature: (Ljava/lang/String;ZJ)V
*/
JNIEXPORT void JNICALL
Java_java_lang_ClassLoader_00024NativeLibrary_unload
-(JNIEnv *env, jobject this, jstring name, jboolean isBuiltin)
+(JNIEnv *env, jclass cls, jstring name, jboolean isBuiltin, jlong address)
{
const char *onUnloadSymbols[] = JNI_ONUNLOAD_SYMBOLS;
void *handle;
JNI_OnUnload_t JNI_OnUnload;
const char *cname;
@@ -424,11 +422,11 @@
return;
cname = JNU_GetStringPlatformChars(env, name, 0);
if (cname == NULL) {
return;
}
- handle = jlong_to_ptr((*env)->GetLongField(env, this, handleID));
+ handle = jlong_to_ptr(address);
JNI_OnUnload = (JNI_OnUnload_t )findJniFunction(env, handle,
isBuiltin ? cname : NULL,
JNI_FALSE);
if (JNI_OnUnload) {
JavaVM *jvm;
@@ -441,15 +439,15 @@
JNU_ReleaseStringPlatformChars(env, name, cname);
}
/*
* Class: java_lang_ClassLoader_NativeLibrary
- * Method: find
+ * Method: findEntry
* Signature: (Ljava/lang/String;)J
*/
JNIEXPORT jlong JNICALL
-Java_java_lang_ClassLoader_00024NativeLibrary_find
+Java_java_lang_ClassLoader_00024NativeLibrary_findEntry
(JNIEnv *env, jobject this, jstring name)
{
jlong handle;
const char *cname;
jlong res;
< prev index next >