diff options
author | hseigel <none@none> | 2013-07-08 18:26:26 -0700 |
---|---|---|
committer | hseigel <none@none> | 2013-07-08 18:26:26 -0700 |
commit | 1dbe88d96591c32bcaa0d60a267621d5d860f636 (patch) | |
tree | 4e0cfe149f9b1b69399165cb1a6731dd27b4d6e1 /src/share/vm | |
parent | 6147890c92cb7db787d322c1b33f57567775d0d4 (diff) | |
parent | e93ad2e22519c9b3604d172aea977f34a68896e8 (diff) |
Merge
Diffstat (limited to 'src/share/vm')
-rw-r--r-- | src/share/vm/classfile/javaClasses.hpp | 2 | ||||
-rw-r--r-- | src/share/vm/prims/jvm.cpp | 20 | ||||
-rw-r--r-- | src/share/vm/prims/jvm.h | 3 |
3 files changed, 1 insertions, 24 deletions
diff --git a/src/share/vm/classfile/javaClasses.hpp b/src/share/vm/classfile/javaClasses.hpp index 81f570581..899d3ba48 100644 --- a/src/share/vm/classfile/javaClasses.hpp +++ b/src/share/vm/classfile/javaClasses.hpp @@ -234,6 +234,7 @@ class java_lang_Class : AllStatic { static GrowableArray<Klass*>* _fixup_mirror_list; static void set_init_lock(oop java_class, oop init_lock); + static void set_protection_domain(oop java_class, oop protection_domain); public: static void compute_offsets(); @@ -272,7 +273,6 @@ class java_lang_Class : AllStatic { // Support for embedded per-class oops static oop protection_domain(oop java_class); - static void set_protection_domain(oop java_class, oop protection_domain); static oop init_lock(oop java_class); static objArrayOop signers(oop java_class); static void set_signers(oop java_class, objArrayOop signers); diff --git a/src/share/vm/prims/jvm.cpp b/src/share/vm/prims/jvm.cpp index da34f2e13..caed2d136 100644 --- a/src/share/vm/prims/jvm.cpp +++ b/src/share/vm/prims/jvm.cpp @@ -1121,26 +1121,6 @@ JVM_ENTRY(jobject, JVM_GetProtectionDomain(JNIEnv *env, jclass cls)) JVM_END -// Obsolete since 1.2 (Class.setProtectionDomain removed), although -// still defined in core libraries as of 1.5. -JVM_ENTRY(void, JVM_SetProtectionDomain(JNIEnv *env, jclass cls, jobject protection_domain)) - JVMWrapper("JVM_SetProtectionDomain"); - if (JNIHandles::resolve(cls) == NULL) { - THROW(vmSymbols::java_lang_NullPointerException()); - } - if (!java_lang_Class::is_primitive(JNIHandles::resolve(cls))) { - // Call is ignored for primitive types - Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve(cls)); - - // cls won't be an array, as this called only from ClassLoader.defineClass - if (k->oop_is_instance()) { - oop pd = JNIHandles::resolve(protection_domain); - assert(pd == NULL || pd->is_oop(), "just checking"); - java_lang_Class::set_protection_domain(k->java_mirror(), pd); - } - } -JVM_END - static bool is_authorized(Handle context, instanceKlassHandle klass, TRAPS) { // If there is a security manager and protection domain, check the access // in the protection domain, otherwise it is authorized. diff --git a/src/share/vm/prims/jvm.h b/src/share/vm/prims/jvm.h index 486b13531..6248f4d79 100644 --- a/src/share/vm/prims/jvm.h +++ b/src/share/vm/prims/jvm.h @@ -471,9 +471,6 @@ JVM_SetClassSigners(JNIEnv *env, jclass cls, jobjectArray signers); JNIEXPORT jobject JNICALL JVM_GetProtectionDomain(JNIEnv *env, jclass cls); -JNIEXPORT void JNICALL -JVM_SetProtectionDomain(JNIEnv *env, jclass cls, jobject protection_domain); - JNIEXPORT jboolean JNICALL JVM_IsArrayClass(JNIEnv *env, jclass cls); |