From 2f2de77c1dfd85b365ee8be36a116a4fb67e0dad Mon Sep 17 00:00:00 2001
From: Chris Hegarty <chegar@openjdk.org>
Date: Fri, 19 Aug 2016 18:06:46 +0100
Subject: [PATCH] 8156841: sun.security.pkcs11.SunPKCS11 poller thread retains
 a strong reference to the context class loader

Reviewed-by: dfuchs, jnimeh, valeriep
---
 .../share/classes/sun/security/pkcs11/SunPKCS11.java             | 1 +
 1 file changed, 1 insertion(+)

diff --git a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java
index 2946bdbdb52..98b5e21ea2c 100644
--- a/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java
+++ b/jdk/src/jdk.crypto.pkcs11/share/classes/sun/security/pkcs11/SunPKCS11.java
@@ -818,6 +818,7 @@ public final class SunPKCS11 extends AuthProvider {
         }
         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();