Initial load
diff --git a/test/java/lang/ThreadLocal/ImmutableLocal.java b/test/java/lang/ThreadLocal/ImmutableLocal.java
new file mode 100644
index 0000000..df6c86d
--- /dev/null
+++ b/test/java/lang/ThreadLocal/ImmutableLocal.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+/*
+ * @test
+ * @bug     6387919
+ * @summary Confirm ThreadLocal.set() usage is not a side effect of get()
+ * @author  Pete Soper
+ */
+public class ImmutableLocal
+{
+    /**
+     * {@link ThreadLocal} guaranteed to always return the same reference.
+     */
+    abstract public static class ImmutableThreadLocal extends ThreadLocal {
+        public void set(final Object value) {
+            throw new RuntimeException("ImmutableThreadLocal set called");
+        }
+
+        // force override
+        abstract protected Object initialValue();
+    }
+
+    private static final ThreadLocal cache = new ImmutableThreadLocal() {
+        public Object initialValue() {
+            return Thread.currentThread().getName();
+        }
+    };
+
+    public static void main(final String[] args) {
+        System.out.println("cache.get() = " + cache.get());
+    }
+}