mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 07:14:30 +02:00
8177530: Module system implementation refresh (4/2017)
Co-authored-by: Harold Seigel <harold.seigel@oracle.com> Co-authored-by: Mandy Chung <mandy.chung@oracle.com> Reviewed-by: lfoltan, sspitsyn
This commit is contained in:
parent
4ffa7d7bfc
commit
a3ab143c64
90 changed files with 477 additions and 464 deletions
|
@ -47,7 +47,7 @@ extern "C" {
|
|||
#define FAILED 2
|
||||
|
||||
static const char *EXC_CNAME = "java/lang/Exception";
|
||||
static const char* MOD_CNAME = "Ljava/lang/reflect/Module;";
|
||||
static const char* MOD_CNAME = "Ljava/lang/Module;";
|
||||
|
||||
static jvmtiEnv *jvmti = NULL;
|
||||
static jint result = PASSED;
|
||||
|
@ -115,7 +115,7 @@ jobject get_class_loader(jclass cls) {
|
|||
}
|
||||
|
||||
static
|
||||
jclass jlrM(JNIEnv *env) {
|
||||
jclass jlM(JNIEnv *env) {
|
||||
jclass cls = NULL;
|
||||
|
||||
cls = JNI_ENV_PTR(env)->FindClass(JNI_ENV_ARG(env, MOD_CNAME));
|
||||
|
@ -142,7 +142,7 @@ jobject get_module_loader(JNIEnv *env, jobject module) {
|
|||
jobject loader = NULL;
|
||||
|
||||
if (cl_method == NULL) {
|
||||
cl_method = get_method(env, jlrM(env), "getClassLoader", "()Ljava/lang/ClassLoader;");
|
||||
cl_method = get_method(env, jlM(env), "getClassLoader", "()Ljava/lang/ClassLoader;");
|
||||
}
|
||||
loader = (jobject)JNI_ENV_PTR(env)->CallObjectMethod(JNI_ENV_ARG(env, module), cl_method);
|
||||
return loader;
|
||||
|
@ -157,7 +157,7 @@ const char* get_module_name(JNIEnv *env, jobject module) {
|
|||
const char *nstr = NULL;
|
||||
|
||||
if (method == NULL) {
|
||||
method = get_method(env, jlrM(env), "getName", "()Ljava/lang/String;");
|
||||
method = get_method(env, jlM(env), "getName", "()Ljava/lang/String;");
|
||||
}
|
||||
jstr = (jstring)JNI_ENV_PTR(env)->CallObjectMethod(JNI_ENV_ARG(env, module), method);
|
||||
if (jstr != NULL) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue