# HG changeset patch
# User ddehaven
# Date 1471628489 25200
# Node ID 228cfe395a585c968fdf6a5fda1ed17597f88a40
# Parent  99f45c5df3f211bcd026adf70a88da3533d69bf6# Parent  2e02ba62a678c0be4fac43eeaac38e25e4568830
Merge

diff -r 99f45c5df3f2 -r 228cfe395a58 jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java
--- a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java	Fri Aug 19 08:47:12 2016 -0700
+++ b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java	Fri Aug 19 10:41:29 2016 -0700
@@ -818,6 +818,7 @@
         }
         final TokenPoller poller = new TokenPoller(this);
         Thread t = new Thread(null, poller, "Poller " + getName(), 0, false);
+        t.setContextClassLoader(null);
         t.setDaemon(true);
         t.setPriority(Thread.MIN_PRIORITY);
         t.start();