# HG changeset patch
# User jwilhelm
# Date 1490110757 -3600
# Node ID 8be4fee954fb25ed97ef76275edaa9433fbf7684
# Parent  ff7d3d1f0d92568d74a88fa09cf05426b2c15b88# Parent  9688370d8b66ade980b60362aa3f959812b7ec49
Merge

diff -r ff7d3d1f0d92 -r 8be4fee954fb jdk/src/java.base/share/classes/java/lang/Class.java
--- a/jdk/src/java.base/share/classes/java/lang/Class.java	Fri Mar 17 16:15:14 2017 -0700
+++ b/jdk/src/java.base/share/classes/java/lang/Class.java	Tue Mar 21 16:39:17 2017 +0100
@@ -2771,7 +2771,7 @@
          * In all other cases, it requires RuntimePermission("accessDeclaredMembers")
          * permission.
          */
-        final ClassLoader ccl = caller.getClassLoader0();
+        final ClassLoader ccl = ClassLoader.getClassLoader(caller);
         if (which != Member.PUBLIC) {
             final ClassLoader cl = getClassLoader0();
             if (ccl != cl) {
diff -r ff7d3d1f0d92 -r 8be4fee954fb jdk/test/TEST.groups
--- a/jdk/test/TEST.groups	Fri Mar 17 16:15:14 2017 -0700
+++ b/jdk/test/TEST.groups	Tue Mar 21 16:39:17 2017 +0100
@@ -28,8 +28,6 @@
 tier1 = \
     :jdk_lang \
     :jdk_util \
-    -java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java \
-    -java/util/concurrent/forkjoin/FJExceptionTableLeak.java \
     sun/nio/cs/ISO8859x.java \
     java/nio/Buffer \
     com/sun/crypto/provider/Cipher \
@@ -37,8 +35,6 @@
     tools/pack200
 
 tier2 = \
-    java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java \
-    java/util/concurrent/forkjoin/FJExceptionTableLeak.java \
     :jdk_io \
     :jdk_nio \
     -sun/nio/cs/ISO8859x.java \
diff -r ff7d3d1f0d92 -r 8be4fee954fb jdk/test/sun/net/www/http/HttpClient/B8025710.java
--- a/jdk/test/sun/net/www/http/HttpClient/B8025710.java	Fri Mar 17 16:15:14 2017 -0700
+++ b/jdk/test/sun/net/www/http/HttpClient/B8025710.java	Tue Mar 21 16:39:17 2017 +0100
@@ -37,6 +37,7 @@
  * @test
  * @bug 8025710
  * @summary Proxied https connection reuse by HttpClient can send CONNECT to the server
+ * @run main/othervm B8025710
  */
 public class B8025710 {