Initial load
diff --git a/test/java/util/TreeMap/ContainsValue.java b/test/java/util/TreeMap/ContainsValue.java
new file mode 100644
index 0000000..888ffc3
--- /dev/null
+++ b/test/java/util/TreeMap/ContainsValue.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 1999 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 4212425
+ * @summary TreeMap.containsValue throws NullPointerExc for empty TreeMap
+ */
+
+import java.util.*;
+
+public class ContainsValue {
+    static public void main (String[] args) {
+        Map map = new TreeMap();
+
+        if (map.containsValue ("gemutlichkeit"))
+            throw new RuntimeException("containsValue optimistic (non-null)");
+
+        if (map.containsValue (null))
+            throw new RuntimeException("containsValue optimistic (null)");
+
+        map.put("a", null);
+        map.put("b", "gemutlichkeit");
+
+        if (!map.containsValue ("gemutlichkeit"))
+            throw new RuntimeException("containsValue pessimistic (non-null)");
+
+        if (!map.containsValue (null))
+            throw new RuntimeException("containsValue pessimistic (null)");
+    }
+}