diff -r 5bc1428f5490 -r c8252b8fea3d jdk/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java --- a/jdk/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java Mon Apr 04 16:54:59 2016 +0530 +++ b/jdk/src/java.desktop/share/classes/sun/applet/AppletClassLoader.java Mon Apr 04 14:22:07 2016 -0700 @@ -52,7 +52,6 @@ import java.security.PermissionCollection; import sun.awt.AppContext; import sun.awt.SunToolkit; -import sun.misc.ManagedLocalsThread; import sun.net.www.ParseUtil; import sun.security.util.SecurityConstants; @@ -858,13 +857,20 @@ * this operation to complete before continuing, wait for the notifyAll() * operation on the syncObject to occur. */ -class AppContextCreator extends ManagedLocalsThread { +class AppContextCreator extends Thread { Object syncObject = new Object(); AppContext appContext = null; volatile boolean created = false; + /** + * Must call the 5-args super-class constructor to erase locals. + */ + private AppContextCreator() { + throw new UnsupportedOperationException("Must erase locals"); + } + AppContextCreator(ThreadGroup group) { - super(group, "AppContextCreator"); + super(group, null, "AppContextCreator", 0, false); } public void run() {