--- /dev/null	2016-05-17 12:01:17.473251102 +0900
+++ new/test/java/text/Format/DateFormat/bug6317072.java	2016-05-23 13:57:49.571515354 +0900
@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2005, 2016, 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.
+ *
+ * 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.
+ */
+
+/**
+ * @test
+ * @bug 6317072
+ * @summary Make sure NPE is thrown with "null" argumemnts in the
+ *    SimpleDateFormat constructors.
+ */
+
+import java.util.*;
+import java.text.*;
+import java.io.*;
+
+public class bug6317072 {
+
+    public static void main(String[] args) {
+
+        try {
+            new SimpleDateFormat("yy", (Locale)null);
+            throw new RuntimeException("should thrown a NullPointerException");
+        } catch (NullPointerException e) {
+        }
+
+        try {
+            new SimpleDateFormat((String)null, Locale.getDefault());
+            throw new RuntimeException("should thrown a NullPointerException");
+        } catch (NullPointerException e) {
+        }
+
+        try {
+            new SimpleDateFormat("yy", (DateFormatSymbols)null);
+            throw new RuntimeException("should thrown a NullPointerException");
+        } catch (NullPointerException e) {
+        }
+
+        try {
+            new SimpleDateFormat((String)null, DateFormatSymbols.getInstance());
+            throw new RuntimeException("should thrown a NullPointerException");
+        } catch (NullPointerException e) {
+        }
+
+        try {
+            DateFormat.getTimeInstance(DateFormat.FULL, null);
+            throw new RuntimeException("should thrown a NullPointerException");
+        } catch (NullPointerException e) {
+        }
+
+        try {
+            DateFormat.getDateInstance(DateFormat.FULL, null);
+            throw new RuntimeException("should thrown a NullPointerException");
+        } catch (NullPointerException e) {
+        }
+
+        try {
+            DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, null);
+            throw new RuntimeException("should thrown a NullPointerException");
+        } catch (NullPointerException e) {
+        }
+    }
+}