# HG changeset patch
# User hseigel
# Date 1373333186 25200
# Node ID e79a9f26ba2e49540bc1e1d26f44b3945b282882
# Parent  3c7b4b7b2625c2e2bcb71bc76438e76db6a455f2# Parent  26037663c2a67a5b656ace72b4b305b412b4c30d
Merge

diff -r 3c7b4b7b2625 -r e79a9f26ba2e make/bsd/makefiles/mapfile-vers-debug
--- a/make/bsd/makefiles/mapfile-vers-debug	Mon Jul 08 14:53:52 2013 -0700
+++ b/make/bsd/makefiles/mapfile-vers-debug	Mon Jul 08 18:26:26 2013 -0700
@@ -221,7 +221,6 @@
                 _JVM_SetLength
                 _JVM_SetNativeThreadName
                 _JVM_SetPrimitiveArrayElement
-                _JVM_SetProtectionDomain
                 _JVM_SetSockOpt
                 _JVM_SetThreadPriority
                 _JVM_Sleep
diff -r 3c7b4b7b2625 -r e79a9f26ba2e make/bsd/makefiles/mapfile-vers-product
--- a/make/bsd/makefiles/mapfile-vers-product	Mon Jul 08 14:53:52 2013 -0700
+++ b/make/bsd/makefiles/mapfile-vers-product	Mon Jul 08 18:26:26 2013 -0700
@@ -221,7 +221,6 @@
                 _JVM_SetLength
                 _JVM_SetNativeThreadName
                 _JVM_SetPrimitiveArrayElement
-                _JVM_SetProtectionDomain
                 _JVM_SetSockOpt
                 _JVM_SetThreadPriority
                 _JVM_Sleep
diff -r 3c7b4b7b2625 -r e79a9f26ba2e make/linux/makefiles/mapfile-vers-debug
--- a/make/linux/makefiles/mapfile-vers-debug	Mon Jul 08 14:53:52 2013 -0700
+++ b/make/linux/makefiles/mapfile-vers-debug	Mon Jul 08 18:26:26 2013 -0700
@@ -223,7 +223,6 @@
                 JVM_SetLength;
                 JVM_SetNativeThreadName;
                 JVM_SetPrimitiveArrayElement;
-                JVM_SetProtectionDomain;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
                 JVM_Sleep;
diff -r 3c7b4b7b2625 -r e79a9f26ba2e make/linux/makefiles/mapfile-vers-product
--- a/make/linux/makefiles/mapfile-vers-product	Mon Jul 08 14:53:52 2013 -0700
+++ b/make/linux/makefiles/mapfile-vers-product	Mon Jul 08 18:26:26 2013 -0700
@@ -223,7 +223,6 @@
                 JVM_SetLength;
                 JVM_SetNativeThreadName;
                 JVM_SetPrimitiveArrayElement;
-                JVM_SetProtectionDomain;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
                 JVM_Sleep;
diff -r 3c7b4b7b2625 -r e79a9f26ba2e make/solaris/makefiles/mapfile-vers
--- a/make/solaris/makefiles/mapfile-vers	Mon Jul 08 14:53:52 2013 -0700
+++ b/make/solaris/makefiles/mapfile-vers	Mon Jul 08 18:26:26 2013 -0700
@@ -223,7 +223,6 @@
                 JVM_SetLength;
                 JVM_SetNativeThreadName;
                 JVM_SetPrimitiveArrayElement;
-                JVM_SetProtectionDomain;
                 JVM_SetSockOpt;
                 JVM_SetThreadPriority;
                 JVM_Sleep;
diff -r 3c7b4b7b2625 -r e79a9f26ba2e src/share/vm/classfile/javaClasses.hpp
--- a/src/share/vm/classfile/javaClasses.hpp	Mon Jul 08 14:53:52 2013 -0700
+++ b/src/share/vm/classfile/javaClasses.hpp	Mon Jul 08 18:26:26 2013 -0700
@@ -234,6 +234,7 @@
   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 @@
 
   // 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 -r 3c7b4b7b2625 -r e79a9f26ba2e src/share/vm/prims/jvm.cpp
--- a/src/share/vm/prims/jvm.cpp	Mon Jul 08 14:53:52 2013 -0700
+++ b/src/share/vm/prims/jvm.cpp	Mon Jul 08 18:26:26 2013 -0700
@@ -1121,26 +1121,6 @@
 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 -r 3c7b4b7b2625 -r e79a9f26ba2e src/share/vm/prims/jvm.h
--- a/src/share/vm/prims/jvm.h	Mon Jul 08 14:53:52 2013 -0700
+++ b/src/share/vm/prims/jvm.h	Mon Jul 08 18:26:26 2013 -0700
@@ -471,9 +471,6 @@
 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);