--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/langtools/test/tools/javac/modules/NPEEmptyFileTest.java	Thu Mar 17 19:04:28 2016 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2015, 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
+ * @summary NPE while compiling empty javafile with -modulesourcepath option
+ * @library /tools/lib
+ * @modules
+ *      jdk.compiler/com.sun.tools.javac.api
+ *      jdk.compiler/com.sun.tools.javac.main
+ *      jdk.jdeps/com.sun.tools.javap
+ * @build ToolBox ModuleTestBase
+ * @run main NPEEmptyFileTest
+ */
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public class NPEEmptyFileTest extends ModuleTestBase {
+    public static void main(String... args) throws Exception {
+        new NPEEmptyFileTest().runTests();
+    }
+
+    @Test
+    void compileEmptyFile(Path base) throws Exception {
+        Path modules = base.resolve("modules");
+        Files.createDirectories(modules);
+        Path emptyJavaFile = base.resolve("Test.java");
+        tb.writeFile(emptyJavaFile, "");
+        tb.new JavacTask(ToolBox.Mode.EXEC)
+                .options("-modulesourcepath", modules.toString(),
+                        "-d", modules.toString(), emptyJavaFile.toString())
+                .run()
+                .writeAll();
+    }
+}