--- a/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Thu Apr 02 11:43:11 2015 +0100
+++ b/jdk/src/jdk.httpserver/share/classes/sun/net/httpserver/ServerImpl.java	Thu Apr 02 11:43:11 2015 +0100
@@ -36,6 +36,7 @@
 import com.sun.net.httpserver.*;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import sun.misc.ManagedLocalsThread;
 import sun.net.httpserver.HttpConnection.State;
 
 /**
@@ -142,7 +143,7 @@
         if (executor == null) {
             executor = new DefaultExecutor();
         }
-        dispatcherThread = new Thread (dispatcher);
+        dispatcherThread = new ManagedLocalsThread(dispatcher);
         started = true;
         dispatcherThread.start();
     }