From 75efb52ec8a58eee65c11d300e8817e14fe8f6d7 Mon Sep 17 00:00:00 2001 From: Mandy Chung Date: Fri, 2 Dec 2016 11:00:59 -0800 Subject: [PATCH 1/2] 8170633: backslashes in gensrc/module-info.java comments need escaping Reviewed-by: alanb, psandoz, wetmore --- .../src/classes/build/tools/module/GenModuleInfoSource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jdk/make/src/classes/build/tools/module/GenModuleInfoSource.java b/jdk/make/src/classes/build/tools/module/GenModuleInfoSource.java index 368fcc7271a..60d0b6e3132 100644 --- a/jdk/make/src/classes/build/tools/module/GenModuleInfoSource.java +++ b/jdk/make/src/classes/build/tools/module/GenModuleInfoSource.java @@ -146,9 +146,10 @@ public class GenModuleInfoSource { for (String l : lines) { writer.println(l); if (l.trim().startsWith("module ")) { - writer.format(" // source file: %s%n", sourceFile); + // print URI rather than file path to avoid escape + writer.format(" // source file: %s%n", sourceFile.toUri()); for (Path file: extraFiles) { - writer.format(" // %s%n", file); + writer.format(" // %s%n", file.toUri()); } break; } From 0d04fc1e3c73e3802381227c51f0bc36eb7b7a30 Mon Sep 17 00:00:00 2001 From: Abdul Kolarkunnu Date: Fri, 2 Dec 2016 11:05:59 -0800 Subject: [PATCH 2/2] 8170660: RMI regression test failures due to missing @build TestLibrary Reviewed-by: lancea --- .../rmi/registry/RegistryContext/ContextWithNullProperties.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java index d8f9338dbb1..2004d96f2f9 100644 --- a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java +++ b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java @@ -28,6 +28,7 @@ * @modules jdk.naming.rmi/com.sun.jndi.rmi.registry java.rmi/sun.rmi.registry * java.rmi/sun.rmi.server java.rmi/sun.rmi.transport java.rmi/sun.rmi.transport.tcp * @library ../../../../../../java/rmi/testlibrary + * @build TestLibrary * @compile --add-modules jdk.naming.rmi ContextWithNullProperties.java * @run main ContextWithNullProperties */