1.1 --- a/src/share/vm/prims/jvm.cpp Fri Jul 05 08:09:40 2013 -0700 1.2 +++ b/src/share/vm/prims/jvm.cpp Mon Jul 08 19:36:22 2013 -0400 1.3 @@ -1121,26 +1121,6 @@ 1.4 JVM_END 1.5 1.6 1.7 -// Obsolete since 1.2 (Class.setProtectionDomain removed), although 1.8 -// still defined in core libraries as of 1.5. 1.9 -JVM_ENTRY(void, JVM_SetProtectionDomain(JNIEnv *env, jclass cls, jobject protection_domain)) 1.10 - JVMWrapper("JVM_SetProtectionDomain"); 1.11 - if (JNIHandles::resolve(cls) == NULL) { 1.12 - THROW(vmSymbols::java_lang_NullPointerException()); 1.13 - } 1.14 - if (!java_lang_Class::is_primitive(JNIHandles::resolve(cls))) { 1.15 - // Call is ignored for primitive types 1.16 - Klass* k = java_lang_Class::as_Klass(JNIHandles::resolve(cls)); 1.17 - 1.18 - // cls won't be an array, as this called only from ClassLoader.defineClass 1.19 - if (k->oop_is_instance()) { 1.20 - oop pd = JNIHandles::resolve(protection_domain); 1.21 - assert(pd == NULL || pd->is_oop(), "just checking"); 1.22 - java_lang_Class::set_protection_domain(k->java_mirror(), pd); 1.23 - } 1.24 - } 1.25 -JVM_END 1.26 - 1.27 static bool is_authorized(Handle context, instanceKlassHandle klass, TRAPS) { 1.28 // If there is a security manager and protection domain, check the access 1.29 // in the protection domain, otherwise it is authorized.