changeset 3489:8e4070f9a7ae

8133058: NPE while compiling empty javafile with -modulesourcepath option Reviewed-by: jjg
author vromero
date Tue, 08 Dec 2015 18:39:21 -0800
parents 4af41bbaaa94
children 041dafa89238
files src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java test/tools/javac/modules/T8133058/NPEEmptyFileTest.java
diffstat 2 files changed, 58 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Sun Dec 06 08:40:00 2015 +0000
+++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Modules.java	Tue Dec 08 18:39:21 2015 -0800
@@ -256,8 +256,10 @@
         // update the module for each compilation unit
         if (multiModuleMode) {
             for (JCCompilationUnit tree: trees) {
-                if (tree.defs.isEmpty())
+                if (tree.defs.isEmpty()) {
+                    tree.modle = syms.unnamedModule;
                     continue;
+                }
 
                 JavaFileObject prev = log.useSource(tree.sourcefile);
                 try {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/modules/T8133058/NPEEmptyFileTest.java	Tue Dec 08 18:39:21 2015 -0800
@@ -0,0 +1,55 @@
+/*
+ * 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
+ * @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();
+    }
+}