--- a/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java	Thu Apr 02 11:43:11 2015 +0100
+++ b/jdk/src/java.management/share/classes/com/sun/jmx/remote/internal/ServerCommunicatorAdmin.java	Fri Aug 01 13:31:03 2014 +0200
@@ -25,9 +25,9 @@
 
 package com.sun.jmx.remote.internal;
 
-import java.io.IOException;
 
 import com.sun.jmx.remote.util.ClassLogger;
+import sun.misc.ManagedLocalsThread;
 
 public abstract class ServerCommunicatorAdmin {
     public ServerCommunicatorAdmin(long timeout) {
@@ -42,7 +42,7 @@
         timestamp = 0;
         if (timeout < Long.MAX_VALUE) {
             Runnable timeoutTask = new Timeout();
-            final Thread t = new Thread(timeoutTask);
+            final Thread t = new ManagedLocalsThread(timeoutTask);
             t.setName("JMX server connection timeout " + t.getId());
             // If you change this name you will need to change a unit test
             // (NoServerTimeoutTest)