--- /dev/null	2012-12-05 10:40:46.603834579 -0800
+++ new/test/java/lang/ThreadLocal/ThreadLocalSupplierTest.java	2012-12-05 11:23:54.479709931 -0800
@@ -0,0 +1,116 @@
+/*
+ * Copyright (c) 2012, Oracle and/or its affiliates. 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.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.function.Supplier;
+import org.testng.annotations.Test;
+import static org.testng.Assert.*;
+
+/**
+ * @test
+ * @run testng ThreadLocalSupplierTest
+ * @summary tests ThreadLocal<Supplier>. Adapted from java.lang.Basic functional test of ThreadLocal
+ *
+ * @author Jim Gish <jim.gish@oracle.com>
+ */
+@Test
+public class ThreadLocalSupplierTest {
+    static IntegerFactory theFactory = new IntegerFactory();
+
+    static class MyThreadLocal extends ThreadLocal<Integer> {
+        public volatile boolean everCalled;
+
+        public MyThreadLocal( Supplier<Integer> f ) {
+            super(f);
+        }
+
+        @Override
+        protected synchronized Integer initialValue() {
+            // N.B. this should never be called since we are using the factory
+            // instead
+            everCalled = true;
+            return null;
+        }
+    }
+
+    /**
+     * Our one and only ThreadLocal from which we get thread ids using a
+     * factory which simply increments a counter on each call of make().
+     */
+    static MyThreadLocal threadLocal = new MyThreadLocal(theFactory);
+
+    static class IntegerFactory implements Supplier<Integer> {
+        private AtomicInteger whatImake = new AtomicInteger(0);
+
+        @Override
+        public Integer get() {
+            return whatImake.getAndIncrement();
+        }
+
+        public int numCalls() {
+            return whatImake.intValue();
+        }
+    }
+
+    public ThreadLocalSupplierTest() {
+    }
+
+    public void test() throws Exception {
+        int threadCount = 500;
+        Thread th[] = new Thread[threadCount];
+        final boolean visited[] = new boolean[threadCount];
+
+        // Create and start the threads
+        for (int i = 0; i < threadCount; i++) {
+            th[i] = new Thread() {
+                @Override
+                public void run() {
+                    int threadId = threadLocal.get();
+                    assertFalse(visited[threadId], "visited[" + threadId + "]=" + visited[threadId]);
+                    visited[threadId] = true;
+                    // check the get() again
+                    int secondCheckThreadId = threadLocal.get();
+                    assertEquals( secondCheckThreadId, threadId );
+                    Thread.yield();
+                }
+            };
+            th[i].start();
+        }
+
+        // Wait for the threads to finish
+        for (int i = 0; i < threadCount; i++) {
+            th[i].join();
+        }
+
+        assertEquals(theFactory.numCalls(), threadCount );
+        // make sure the provided initialValue() has not been called
+        assertFalse(threadLocal.everCalled);
+        // Check results
+        for (int i = 0; i < threadCount; i++) {
+            assertTrue(visited[i],"visited[" + i + "]=" + visited[i]);
+        }
+    }
+}
+