# HG changeset patch # User chegar # Date 1461072883 -3600 # Node ID 230612715768125f3ea899d2cef2c03337fd8c25 # Parent 8d78fb40648dd221ce4ef19f9d5aa41ee1a3a884 8148863: Remove sun.misc.ManagedLocalsThread from corba Reviewed-by: alanb, coffeys, msheppar diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/corba/RequestImpl.java Tue Apr 19 14:34:43 2016 +0100 @@ -255,7 +255,7 @@ public synchronized void send_deferred() { AsynchInvoke invokeObject = new AsynchInvoke(_orb, this, false); - new sun.misc.ManagedLocalsThread(invokeObject).start(); + new Thread(null, invokeObject, "Async-Request-Invoker-Thread", 0, false).start(); } public synchronized boolean poll_response() diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/javax/rmi/CORBA/Util.java Tue Apr 19 14:34:43 2016 +0100 @@ -751,12 +751,13 @@ } } -class KeepAlive extends sun.misc.ManagedLocalsThread +class KeepAlive extends Thread { boolean quit = false; public KeepAlive () { + super(null, null, "Servant-KeepAlive-Thread", 0, false); setDaemon(false); } diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAImpl.java Tue Apr 19 14:34:43 2016 +0100 @@ -516,7 +516,7 @@ // Converted from anonymous class to local class // so that we can call performDestroy() directly. - static class DestroyThread extends sun.misc.ManagedLocalsThread { + static class DestroyThread extends Thread { private boolean wait ; private boolean etherealize ; private boolean debug ; @@ -524,6 +524,7 @@ public DestroyThread( boolean etherealize, boolean debug ) { + super(null, null, "POA-Destroy-Thread", 0, false); this.etherealize = etherealize ; this.debug = debug ; } diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAManagerImpl.java Tue Apr 19 14:34:43 2016 +0100 @@ -357,7 +357,7 @@ if (wait_for_completion) deactivator.run() ; else { - Thread thr = new sun.misc.ManagedLocalsThread(deactivator) ; + Thread thr = new Thread(null, deactivator, "POA-Deactivator-Thread", 0, false) ; thr.start() ; } } finally { diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/oa/poa/POAPolicyMediatorImpl_R_USM.java Tue Apr 19 14:34:43 2016 +0100 @@ -302,7 +302,7 @@ throw new WrongPolicy(); } - class Etherealizer extends sun.misc.ManagedLocalsThread { + class Etherealizer extends Thread { private POAPolicyMediatorImpl_R_USM mediator ; private ActiveObjectMap.Key key ; private AOMEntry entry ; @@ -314,6 +314,7 @@ ActiveObjectMap.Key key, AOMEntry entry, Servant servant, boolean debug ) { + super(null, null, "PAO-Etherealizer-Thread", 0, false); this.mediator = mediator ; this.key = key ; this.entry = entry; diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orb/ORBImpl.java Tue Apr 19 14:34:43 2016 +0100 @@ -691,7 +691,7 @@ for (int i = 0; i < req.length; i++) { AsynchInvoke invokeObject = new AsynchInvoke( this, (com.sun.corba.se.impl.corba.RequestImpl)req[i], true); - new sun.misc.ManagedLocalsThread(invokeObject).start(); + new Thread(null, invokeObject, "ORB-Request-Thread", 0, false).start(); } } diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/orbutil/threadpool/ThreadPoolImpl.java Tue Apr 19 14:34:43 2016 +0100 @@ -459,7 +459,7 @@ } - private class WorkerThread extends sun.misc.ManagedLocalsThread implements Closeable + private class WorkerThread extends Thread implements Closeable { private Work currentWork; private int threadId = 0; // unique id for the thread @@ -469,7 +469,7 @@ private StringBuffer workerThreadName = new StringBuffer(); WorkerThread(ThreadGroup tg, String threadPoolName) { - super(tg, "Idle"); + super(tg, null, "Idle", 0, false); this.threadId = ThreadPoolImpl.getUniqueThreadId(); this.threadPoolName = threadPoolName; setName(composeWorkerThreadName(threadPoolName, "Idle")); diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java --- a/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/com/sun/corba/se/impl/transport/SelectorImpl.java Tue Apr 19 14:34:43 2016 +0100 @@ -61,7 +61,7 @@ */ class SelectorImpl extends - sun.misc.ManagedLocalsThread + Thread implements com.sun.corba.se.pept.transport.Selector { @@ -79,6 +79,7 @@ public SelectorImpl(ORB orb) { + super(null, null, "ORB-Selector-Thread", 0, false); this.orb = orb; selector = null; selectorStarted = false; @@ -277,7 +278,6 @@ public void run() { - setName("SelectorThread"); while (!closed) { try { int n = 0; diff -r 8d78fb40648d -r 230612715768 corba/src/java.corba/share/classes/module-info.java --- a/corba/src/java.corba/share/classes/module-info.java Wed Jul 05 21:36:10 2017 +0200 +++ b/corba/src/java.corba/share/classes/module-info.java Tue Apr 19 14:34:43 2016 +0100 @@ -29,8 +29,6 @@ requires java.logging; requires java.naming; requires java.transaction; - // 8148863 - requires jdk.unsupported; exports javax.activity; exports javax.rmi;