changeset 3046:b2e9e8d1805c

Merge
author chegar
date Wed, 30 Jun 2010 16:24:37 +0100
parents 5f50e564faa4 de8991ef7b1b
children 32cac17b629e
files
diffstat 1 files changed, 42 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/lang/Thread.java	Wed Jun 30 11:32:38 2010 +0400
+++ b/src/share/classes/java/lang/Thread.java	Wed Jun 30 16:24:37 2010 +0100
@@ -260,6 +260,10 @@
     /* Remembered Throwable from stop before start */
     private Throwable throwableFromStop;
 
+    /* Whether or not the Thread has been completely constructed;
+     * init or clone method has successfully completed */
+    private volatile Thread me;    // null
+
     /**
      * Returns a reference to the currently executing thread object.
      *
@@ -411,6 +415,43 @@
 
         /* Set thread ID */
         tid = nextThreadID();
+
+        this.me = this;
+    }
+
+    /**
+     * Returns a clone if the class of this object is {@link Cloneable Cloneable}.
+     *
+     * @return  a clone if the class of this object is {@code Cloneable}
+     *
+     * @throws  CloneNotSupportedException
+     *          if this method is invoked on a class that does not
+     *          support {@code Cloneable}
+     */
+    @Override
+    protected Object clone() throws CloneNotSupportedException {
+        Thread t;
+        synchronized(this) {
+            t = (Thread) super.clone();
+
+            t.tid = nextThreadID();
+            t.parkBlocker = null;
+            t.blocker = null;
+            t.blockerLock = new Object();
+            t.threadLocals = null;
+
+            group.checkAccess();
+            group.addUnstarted();
+            t.setPriority(priority);
+
+            final Thread current = Thread.currentThread();
+            if (current.inheritableThreadLocals != null)
+                t.inheritableThreadLocals =
+                    ThreadLocal.createInheritedMap(current.inheritableThreadLocals);
+        }
+
+        t.me = t;
+        return t;
     }
 
     /**
@@ -672,7 +713,7 @@
          *
          * A zero status value corresponds to state "NEW".
          */
-        if (threadStatus != 0)
+        if (threadStatus != 0 || this != me)
             throw new IllegalThreadStateException();
 
         /* Notify the group that this thread is about to be started