s2 = parent.resources(name);
- return Stream.concat(s1, s2);
- }
-
/**
* Finds the resources with the given name in this class loader.
*/
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
--- a/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java Wed Dec 06 14:13:50 2017 +0100
+++ b/src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java Wed Dec 06 14:17:44 2017 +0100
@@ -124,16 +124,6 @@
void registerShutdownHook(int slot, boolean registerShutdownInProgress, Runnable hook);
/**
- * Returns a new string backed by the provided character array. The
- * character array is not copied and must never be modified after the
- * String is created, in order to fulfill String's contract.
- *
- * @param chars the character array to back the string
- * @return a newly created string whose content is the character array
- */
- String newStringUnsafe(char[] chars);
-
- /**
* Returns a new Thread with the given Runnable and an
* inherited AccessControlContext.
*/
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/java.sql/share/classes/java/sql/Date.java
--- a/src/java.sql/share/classes/java/sql/Date.java Wed Dec 06 14:13:50 2017 +0100
+++ b/src/java.sql/share/classes/java/sql/Date.java Wed Dec 06 14:17:44 2017 +0100
@@ -27,8 +27,6 @@
import java.time.Instant;
import java.time.LocalDate;
-import jdk.internal.misc.SharedSecrets;
-import jdk.internal.misc.JavaLangAccess;
/**
* A thin wrapper around a millisecond value that allows
@@ -46,8 +44,6 @@
*/
public class Date extends java.util.Date {
- private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
-
/**
* Constructs a Date object initialized with the given
* year, month, and day.
@@ -168,7 +164,7 @@
buf[7] = '-';
Date.formatDecimalInt(day, buf, 8, 2);
- return jla.newStringUnsafe(buf);
+ return new String(buf);
}
/**
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/java.sql/share/classes/java/sql/Time.java
--- a/src/java.sql/share/classes/java/sql/Time.java Wed Dec 06 14:13:50 2017 +0100
+++ b/src/java.sql/share/classes/java/sql/Time.java Wed Dec 06 14:17:44 2017 +0100
@@ -27,8 +27,6 @@
import java.time.Instant;
import java.time.LocalTime;
-import jdk.internal.misc.SharedSecrets;
-import jdk.internal.misc.JavaLangAccess;
/**
*
A thin wrapper around the java.util.Date class that allows the JDBC
@@ -43,8 +41,6 @@
*/
public class Time extends java.util.Date {
- private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
-
/**
* Constructs a Time object initialized with the
* given values for the hour, minute, and second.
@@ -134,7 +130,7 @@
buf[5] = ':';
Date.formatDecimalInt(second, buf, 6, 2);
- return jla.newStringUnsafe(buf);
+ return new String(buf);
}
// Override all the date operations inherited from java.util.Date;
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/java.sql/share/classes/java/sql/Timestamp.java
--- a/src/java.sql/share/classes/java/sql/Timestamp.java Wed Dec 06 14:13:50 2017 +0100
+++ b/src/java.sql/share/classes/java/sql/Timestamp.java Wed Dec 06 14:17:44 2017 +0100
@@ -27,8 +27,6 @@
import java.time.Instant;
import java.time.LocalDateTime;
-import jdk.internal.misc.SharedSecrets;
-import jdk.internal.misc.JavaLangAccess;
/**
*
A thin wrapper around {@code java.util.Date} that allows
@@ -74,8 +72,6 @@
*/
public class Timestamp extends java.util.Date {
- private static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
-
/**
* Constructs a {@code Timestamp} object initialized
* with the given values.
@@ -313,7 +309,7 @@
buf[yearSize + 15] = '.';
Date.formatDecimalInt(tmpNanos, buf, yearSize + 16, 9 - trailingZeros);
- return jla.newStringUnsafe(buf);
+ return new String(buf);
}
/**
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java Wed Dec 06 14:13:50 2017 +0100
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/JlinkTask.java Wed Dec 06 14:17:44 2017 +0100
@@ -430,7 +430,7 @@
Set roots)
{
if (Objects.requireNonNull(paths).isEmpty()) {
- throw new IllegalArgumentException("Empty module path");
+ throw new IllegalArgumentException(taskHelper.getMessage("err.empty.module.path"));
}
Path[] entries = paths.toArray(new Path[0]);
@@ -447,8 +447,13 @@
// java.base version is different than the current runtime version
version = Runtime.Version.parse(v.toString());
- if (Runtime.version().major() != version.major()) {
- finder = ModulePath.of(version, true, entries);
+ if (Runtime.version().major() != version.major() ||
+ Runtime.version().minor() != version.minor()) {
+ // jlink version and java.base version do not match.
+ // We do not (yet) support this mode.
+ throw new IllegalArgumentException(taskHelper.getMessage("err.jlink.version.mismatch",
+ Runtime.version().major(), Runtime.version().minor(),
+ version.major(), version.minor()));
}
}
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java Wed Dec 06 14:13:50 2017 +0100
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java Wed Dec 06 14:17:44 2017 +0100
@@ -54,11 +54,8 @@
public final class GenerateJLIClassesPlugin implements Plugin {
private static final String NAME = "generate-jli-classes";
- private static final String IGNORE_VERSION = "ignore-version";
private static final String DESCRIPTION = PluginsResourceBundle.getDescription(NAME);
- private static final String IGNORE_VERSION_WARNING = NAME + ".ignore.version.warn";
- private static final String VERSION_MISMATCH_WARNING = NAME + ".version.mismatch.warn";
private static final String DEFAULT_TRACE_FILE = "default_jli_trace.txt";
@@ -85,8 +82,6 @@
String mainArgument;
- boolean ignoreVersion;
-
public GenerateJLIClassesPlugin() {
}
@@ -170,7 +165,6 @@
@Override
public void configure(Map config) {
mainArgument = config.get(NAME);
- ignoreVersion = Boolean.parseBoolean(config.get(IGNORE_VERSION));
}
public void initialize(ResourcePool in) {
@@ -208,26 +202,6 @@
}
}
- private boolean checkVersion(Runtime.Version linkedVersion) {
- Runtime.Version baseVersion = Runtime.version();
- if (baseVersion.major() != linkedVersion.major() ||
- baseVersion.minor() != linkedVersion.minor()) {
- return false;
- }
- return true;
- }
-
- private Runtime.Version getLinkedVersion(ResourcePool in) {
- ModuleDescriptor.Version version = in.moduleView()
- .findModule("java.base")
- .get()
- .descriptor()
- .version()
- .orElseThrow(() -> new PluginException("No version defined in "
- + "the java.base being linked"));
- return Runtime.Version.parse(version.toString());
- }
-
private void readTraceConfig(Stream lines) {
// Use TreeSet/TreeMap to keep things sorted in a deterministic
// order to avoid scrambling the layout on small changes and to
@@ -315,24 +289,6 @@
@Override
public ResourcePool transform(ResourcePool in, ResourcePoolBuilder out) {
- if (ignoreVersion) {
- System.out.println(
- PluginsResourceBundle
- .getMessage(IGNORE_VERSION_WARNING));
- } else if (!checkVersion(getLinkedVersion(in))) {
- // The linked images are not version compatible
- if (mainArgument != null) {
- // Log a mismatch warning if an argument was specified
- System.out.println(
- PluginsResourceBundle
- .getMessage(VERSION_MISMATCH_WARNING,
- getLinkedVersion(in),
- Runtime.version()));
- }
- in.transformAndCopy(entry -> entry, out);
- return out.build();
- }
-
initialize(in);
// Copy all but DMH_ENTRY to out
in.transformAndCopy(entry -> {
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties Wed Dec 06 14:13:50 2017 +0100
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/jlink.properties Wed Dec 06 14:17:44 2017 +0100
@@ -107,6 +107,8 @@
error.prefix=Error:
warn.prefix=Warning:
+err.empty.module.path=empty module path
+err.jlink.version.mismatch=jlink version {0}.{1} does not match target java.base version {2}.{3}
err.automatic.module:automatic module cannot be used with jlink: {0} from {1}
err.unknown.byte.order:unknown byte order {0}
err.launcher.main.class.empty:launcher main class name cannot be empty: {0}
diff -r 07d921cdd7a6 -r e2c47e2db0a5 src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties
--- a/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties Wed Dec 06 14:13:50 2017 +0100
+++ b/src/jdk.jlink/share/classes/jdk/tools/jlink/resources/plugins.properties Wed Dec 06 14:17:44 2017 +0100
@@ -75,7 +75,7 @@
exclude-jmod-section.description=\
Specify a JMOD section to exclude
-generate-jli-classes.argument=@filename[:ignore-version=]
+generate-jli-classes.argument=@filename
generate-jli-classes.description=\
Specify a file listing the java.lang.invoke classes to pre-generate. \n\
@@ -84,15 +84,6 @@
created then code generation will be disabled by default to guarantee \n\
correctness - add ignore-version=true to override this.
-generate-jli-classes.ignore.version.warn=\
-WARNING: --generate-jli-classes set to ignore version mismatch between \n\
-JDK running jlink and target image.
-
-generate-jli-classes.version.mismatch.warn=\
-WARNING: Pre-generation of JLI classes is only supported when linking \n\
-the same version of java.base ({0}) as the JDK running jlink ({1}), \n\
-class generation skipped - specify ignore-version to override.
-
system-modules.argument=retainModuleTarget
system-modules.description=Fast loading of module descriptors (always enabled)
diff -r 07d921cdd7a6 -r e2c47e2db0a5 test/jdk/ProblemList.txt
--- a/test/jdk/ProblemList.txt Wed Dec 06 14:13:50 2017 +0100
+++ b/test/jdk/ProblemList.txt Wed Dec 06 14:17:44 2017 +0100
@@ -124,8 +124,6 @@
java/lang/StringCoding/CheckEncodings.sh 7008363 generic-all
-jdk/internal/misc/JavaLangAccess/NewUnsafeString.java 8176188 generic-all
-
java/lang/String/nativeEncoding/StringPlatformChars.java 8182569 windows-all,solaris-all
############################################################################
diff -r 07d921cdd7a6 -r e2c47e2db0a5 test/jdk/TEST.groups
--- a/test/jdk/TEST.groups Wed Dec 06 14:13:50 2017 +0100
+++ b/test/jdk/TEST.groups Wed Dec 06 14:17:44 2017 +0100
@@ -89,7 +89,6 @@
jdk_util_other = \
java/util \
sun/util \
- jdk/internal/util \
-:jdk_collections \
-:jdk_concurrent \
-:jdk_stream
diff -r 07d921cdd7a6 -r e2c47e2db0a5 test/jdk/java/lang/ClassLoader/RecursiveSystemLoader.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/jdk/java/lang/ClassLoader/RecursiveSystemLoader.java Wed Dec 06 14:17:44 2017 +0100
@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2017, 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 8187222
+ * @run main/othervm -Djava.system.class.loader=RecursiveSystemLoader RecursiveSystemLoader
+ * @summary Test for IllegalStateException if a custom system loader recursively calls getSystemClassLoader()
+ */
+public class RecursiveSystemLoader extends ClassLoader {
+ public static void main(String[] args) {
+ ClassLoader sys = ClassLoader.getSystemClassLoader();
+ if (!(sys instanceof RecursiveSystemLoader)) {
+ throw new RuntimeException("Unexpected system classloader: " + sys);
+ }
+ }
+ public RecursiveSystemLoader(ClassLoader classLoader) {
+ super("RecursiveSystemLoader", classLoader);
+
+ // Calling ClassLoader.getSystemClassLoader() before the VM is booted
+ // should throw an IllegalStateException.
+ try {
+ ClassLoader.getSystemClassLoader();
+ } catch(IllegalStateException ise) {
+ System.err.println("Caught expected exception:");
+ ise.printStackTrace();
+ return;
+ }
+ throw new RuntimeException("Expected IllegalStateException was not thrown.");
+ }
+
+ @Override
+ public Class loadClass(String name) throws ClassNotFoundException {
+ return super.loadClass(name);
+ }
+}
diff -r 07d921cdd7a6 -r e2c47e2db0a5 test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java
--- a/test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java Wed Dec 06 14:13:50 2017 +0100
+++ b/test/jdk/java/lang/ModuleLayer/LayerAndLoadersTest.java Wed Dec 06 14:17:44 2017 +0100
@@ -52,6 +52,7 @@
import java.util.ServiceLoader;
import java.util.Set;
import java.util.stream.Collectors;
+
import jdk.test.lib.compiler.CompilerUtils;
import org.testng.annotations.BeforeTest;
@@ -78,7 +79,7 @@
* Basic test of ModuleLayer.defineModulesWithOneLoader
*
* Test scenario:
- * m1 requires m2 and m3
+ * m1 requires m2 and m3
*/
public void testWithOneLoader() throws Exception {
Configuration cf = resolve("m1");
@@ -105,7 +106,7 @@
* Basic test of ModuleLayer.defineModulesWithManyLoaders
*
* Test scenario:
- * m1 requires m2 and m3
+ * m1 requires m2 and m3
*/
public void testWithManyLoaders() throws Exception {
Configuration cf = resolve("m1");
@@ -136,9 +137,9 @@
* modules is a service provider module.
*
* Test scenario:
- * m1 requires m2 and m3
- * m1 uses S
- * m4 provides S with ...
+ * m1 requires m2 and m3
+ * m1 uses S
+ * m4 provides S with ...
*/
public void testServicesWithOneLoader() throws Exception {
Configuration cf = resolveAndBind("m1");
@@ -175,9 +176,9 @@
* modules is a service provider module.
*
* Test scenario:
- * m1 requires m2 and m3
- * m1 uses S
- * m4 provides S with ...
+ * m1 requires m2 and m3
+ * m1 uses S
+ * m4 provides S with ...
*/
public void testServicesWithManyLoaders() throws Exception {
Configuration cf = resolveAndBind("m1");
@@ -234,7 +235,7 @@
ModuleLayer layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, parent);
testLoad(layer, cn);
- // one loader with boot loader as parent
+ // one loader with boot loader as parent
layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, null);
testLoadFail(layer, cn);
@@ -252,21 +253,21 @@
* Test defineModulesWithXXX when modules that have overlapping packages.
*
* Test scenario:
- * m1 exports p
- * m2 exports p
+ * m1 exports p
+ * m2 exports p
*/
public void testOverlappingPackages() {
ModuleDescriptor descriptor1
- = ModuleDescriptor.newModule("m1").exports("p").build();
+ = ModuleDescriptor.newModule("m1").exports("p").build();
ModuleDescriptor descriptor2
- = ModuleDescriptor.newModule("m2").exports("p").build();
+ = ModuleDescriptor.newModule("m2").exports("p").build();
ModuleFinder finder = ModuleUtils.finderOf(descriptor1, descriptor2);
Configuration cf = ModuleLayer.boot()
- .configuration()
- .resolve(finder, ModuleFinder.of(), Set.of("m1", "m2"));
+ .configuration()
+ .resolve(finder, ModuleFinder.of(), Set.of("m1", "m2"));
// cannot define both module m1 and m2 to the same class loader
try {
@@ -284,35 +285,35 @@
* Test ModuleLayer.defineModulesWithXXX with split delegation.
*
* Test scenario:
- * layer1: m1 exports p, m2 exports p
- * layer2: m3 reads m1, m4 reads m2
+ * layer1: m1 exports p, m2 exports p
+ * layer2: m3 reads m1, m4 reads m2
*/
public void testSplitDelegation() {
ModuleDescriptor descriptor1
- = ModuleDescriptor.newModule("m1").exports("p").build();
+ = ModuleDescriptor.newModule("m1").exports("p").build();
ModuleDescriptor descriptor2
- = ModuleDescriptor.newModule("m2").exports("p").build();
+ = ModuleDescriptor.newModule("m2").exports("p").build();
ModuleFinder finder1 = ModuleUtils.finderOf(descriptor1, descriptor2);
Configuration cf1 = ModuleLayer.boot()
- .configuration()
- .resolve(finder1, ModuleFinder.of(), Set.of("m1", "m2"));
+ .configuration()
+ .resolve(finder1, ModuleFinder.of(), Set.of("m1", "m2"));
ModuleLayer layer1 = ModuleLayer.boot().defineModulesWithManyLoaders(cf1, null);
checkLayer(layer1, "m1", "m2");
ModuleDescriptor descriptor3
- = ModuleDescriptor.newModule("m3").requires("m1").build();
+ = ModuleDescriptor.newModule("m3").requires("m1").build();
ModuleDescriptor descriptor4
- = ModuleDescriptor.newModule("m4").requires("m2").build();
+ = ModuleDescriptor.newModule("m4").requires("m2").build();
ModuleFinder finder2 = ModuleUtils.finderOf(descriptor3, descriptor4);
Configuration cf2 = cf1.resolve(finder2, ModuleFinder.of(),
- Set.of("m3", "m4"));
+ Set.of("m3", "m4"));
// package p cannot be supplied by two class loaders
try {
@@ -331,8 +332,8 @@
* named modules in the parent layer.
*
* Test scenario:
- * layer1: m1, m2, m3 => same loader
- * layer2: m1, m2, m4 => same loader
+ * layer1: m1, m2, m3 => same loader
+ * layer2: m1, m2, m4 => same loader
*/
public void testOverriding1() throws Exception {
Configuration cf1 = resolve("m1");
@@ -342,7 +343,7 @@
ModuleFinder finder = ModuleFinder.of(MODS_DIR);
Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
- Set.of("m1"));
+ Set.of("m1"));
ModuleLayer layer2 = layer1.defineModulesWithOneLoader(cf2, null);
checkLayer(layer2, "m1", "m2", "m3");
@@ -378,8 +379,8 @@
* named modules in the parent layer.
*
* Test scenario:
- * layer1: m1, m2, m3 => loader pool
- * layer2: m1, m2, m3 => loader pool
+ * layer1: m1, m2, m3 => loader pool
+ * layer2: m1, m2, m3 => loader pool
*/
public void testOverriding2() throws Exception {
Configuration cf1 = resolve("m1");
@@ -389,7 +390,7 @@
ModuleFinder finder = ModuleFinder.of(MODS_DIR);
Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
- Set.of("m1"));
+ Set.of("m1"));
ModuleLayer layer2 = layer1.defineModulesWithManyLoaders(cf2, null);
checkLayer(layer2, "m1", "m2", "m3");
@@ -482,7 +483,7 @@
ModuleFinder finder = finderFor("m1", "m3");
Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
- Set.of("m1"));
+ Set.of("m1"));
ModuleLayer layer2 = layer1.defineModulesWithOneLoader(cf2, null);
checkLayer(layer2, "m1", "m3");
@@ -517,7 +518,7 @@
ModuleFinder finder = finderFor("m1", "m3");
Configuration cf2 = cf1.resolve(finder, ModuleFinder.of(),
- Set.of("m1"));
+ Set.of("m1"));
ModuleLayer layer2 = layer1.defineModulesWithManyLoaders(cf2, null);
checkLayer(layer2, "m1", "m3");
@@ -550,18 +551,27 @@
assertTrue(loader6.loadClass("w.Hello").getClassLoader() == loader6);
}
-
/**
* Basic test for locating resources with a class loader created by
* defineModulesWithOneLoader.
*/
public void testResourcesWithOneLoader() throws Exception {
+ testResourcesWithOneLoader(ClassLoader.getSystemClassLoader());
+ testResourcesWithOneLoader(null);
+ }
+
+ /**
+ * Test locating resources with the class loader created by
+ * defineModulesWithOneLoader. The class loader has the given class
+ * loader as its parent.
+ */
+ void testResourcesWithOneLoader(ClassLoader parent) throws Exception {
Configuration cf = resolve("m1");
- ClassLoader scl = ClassLoader.getSystemClassLoader();
- ModuleLayer layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, scl);
+ ModuleLayer layer = ModuleLayer.boot().defineModulesWithOneLoader(cf, parent);
ClassLoader loader = layer.findLoader("m1");
assertNotNull(loader);
+ assertTrue(loader.getParent() == parent);
// check that getResource and getResources are consistent
URL url1 = loader.getResource("module-info.class");
@@ -607,14 +617,24 @@
* defineModulesWithManyLoaders.
*/
public void testResourcesWithManyLoaders() throws Exception {
+ testResourcesWithManyLoaders(ClassLoader.getSystemClassLoader());
+ testResourcesWithManyLoaders(null);
+ }
+
+ /**
+ * Test locating resources with class loaders created by
+ * defineModulesWithManyLoaders. The class loaders have the given class
+ * loader as their parent.
+ */
+ void testResourcesWithManyLoaders(ClassLoader parent) throws Exception {
Configuration cf = resolve("m1");
- ClassLoader scl = ClassLoader.getSystemClassLoader();
- ModuleLayer layer = ModuleLayer.boot().defineModulesWithManyLoaders(cf, scl);
+ ModuleLayer layer = ModuleLayer.boot().defineModulesWithManyLoaders(cf, parent);
for (Module m : layer.modules()) {
String name = m.getName();
ClassLoader loader = m.getClassLoader();
assertNotNull(loader);
+ assertTrue(loader.getParent() == parent);
// getResource should find the module-info.class for the module
URL url = loader.getResource("module-info.class");
diff -r 07d921cdd7a6 -r e2c47e2db0a5 test/jdk/java/text/Format/MessageFormat/MessageRegression.java
--- a/test/jdk/java/text/Format/MessageFormat/MessageRegression.java Wed Dec 06 14:13:50 2017 +0100
+++ b/test/jdk/java/text/Format/MessageFormat/MessageRegression.java Wed Dec 06 14:17:44 2017 +0100
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2017, 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
@@ -25,7 +25,7 @@
* @test
* @bug 4031438 4058973 4074764 4094906 4104976 4105380 4106659 4106660 4106661
* 4111739 4112104 4113018 4114739 4114743 4116444 4118592 4118594 4120552
- * 4142938 4169959 4232154 4293229
+ * 4142938 4169959 4232154 4293229 8187551
* @summary Regression tests for MessageFormat and associated classes
* @library /java/text/testlib
* @run main MessageRegression
@@ -642,4 +642,44 @@
expected + "\", got \"" + result + "\"");
}
}
+
+ /**
+ * @bug 8187551
+ * test MessageFormat.setFormat() method to throw AIOOBE on invalid index.
+ */
+ public void test8187551() {
+ //invalid cases ("pattern", "invalid format element index")
+ String[][] invalidCases = {{"The disk \"{1}\" contains {0}.", "2"},
+ {"The disk \"{1}\" contains {0}.", "9"},
+ {"On {1}, there are {0} and {2} folders", "3"}};
+
+ //invalid cases (must throw exception)
+ Arrays.stream(invalidCases).forEach(entry -> messageSetFormat(entry[0],
+ Integer.valueOf(entry[1])));
+ }
+
+ // test MessageFormat.setFormat() method for the given pattern and
+ // format element index
+ private void messageSetFormat(String pattern, int elemIndex) {
+ MessageFormat form = new MessageFormat(pattern);
+
+ double[] fileLimits = {0, 1, 2};
+ String[] filePart = {"no files", "one file", "{0,number} files"};
+ ChoiceFormat fileForm = new ChoiceFormat(fileLimits, filePart);
+
+ boolean AIOOBEThrown = false;
+ try {
+ form.setFormat(elemIndex, fileForm);
+ } catch (ArrayIndexOutOfBoundsException ex) {
+ AIOOBEThrown = true;
+ }
+
+ if (!AIOOBEThrown) {
+ throw new RuntimeException("[FAILED: Must throw" +
+ " ArrayIndexOutOfBoundsException for" +
+ " invalid index " + elemIndex + " used in" +
+ " MessageFormat.setFormat(index, format)]");
+ }
+ }
+
}
diff -r 07d921cdd7a6 -r e2c47e2db0a5 test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java
--- a/test/jdk/jdk/internal/misc/JavaLangAccess/NewUnsafeString.java Wed Dec 06 14:13:50 2017 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2012, 2017, 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.
- */
-
-import java.util.Objects;
-import java.util.Comparator;
-import jdk.internal.misc.JavaLangAccess;
-import jdk.internal.misc.SharedSecrets;
-
-/*
- * @test
- * @bug 8013528
- * @summary Test JavaLangAccess.newUnsafeString
- * @modules java.base/jdk.internal.misc
- * @compile -XDignore.symbol.file NewUnsafeString.java
- * @run main NewUnsafeString
- */
-public class NewUnsafeString {
-
- static final JavaLangAccess jla = SharedSecrets.getJavaLangAccess();
-
- public static void testNewUnsafeString() {
- String benchmark = "exemplar";
- String constructorCopy = new String(benchmark);
- char[] jlaChars = benchmark.toCharArray();
- String jlaCopy = jla.newStringUnsafe(jlaChars);
-
- if (benchmark == constructorCopy) {
- throw new Error("should be different instances");
- }
- if (!benchmark.equals(constructorCopy)) {
- throw new Error("Copy not equal");
- }
- if (0 != Objects.compare(benchmark, constructorCopy, Comparator.naturalOrder())) {
- throw new Error("Copy not equal");
- }
-
- if (benchmark == jlaCopy) {
- throw new Error("should be different instances");
- }
- if (!benchmark.equals(jlaCopy)) {
- throw new Error("Copy not equal");
- }
- if (0 != Objects.compare(benchmark, jlaCopy, Comparator.naturalOrder())) {
- throw new Error("Copy not equal");
- }
-
- if (constructorCopy == jlaCopy) {
- throw new Error("should be different instances");
- }
- if (!constructorCopy.equals(jlaCopy)) {
- throw new Error("Copy not equal");
- }
- if (0 != Objects.compare(constructorCopy, jlaCopy, Comparator.naturalOrder())) {
- throw new Error("Copy not equal");
- }
-
- // The following is extremely "evil". Never ever do this in non-test code.
- jlaChars[0] = 'X';
- if (!"Xxemplar".equals(jlaCopy)) {
- throw new Error("jla.newStringUnsafe did not use provided string");
- }
-
- }
-
- public static void main(String[] args) {
- testNewUnsafeString();
- }
-}
diff -r 07d921cdd7a6 -r e2c47e2db0a5 test/jdk/tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java
--- a/test/jdk/tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java Wed Dec 06 14:13:50 2017 +0100
+++ b/test/jdk/tools/jlink/multireleasejar/JLinkMRJavaBaseVersionTest.java Wed Dec 06 14:17:44 2017 +0100
@@ -25,6 +25,8 @@
* @test
* @bug 8177471
* @summary jlink should use the version from java.base.jmod to find modules
+ * @bug 8185130
+ * @summary jlink should throw error if target image and current JDK versions don't match
* @modules java.base/jdk.internal.module
* @library /test/lib
* @build jdk.test.lib.process.* CheckRuntimeVersion
@@ -122,7 +124,9 @@
System.out.println("Testing jlink with " + getJmods() + " of target version " + version);
// use jlink to build image from multi-release jar
- jlink("m1.jar", "myimage");
+ if (jlink("m1.jar", "myimage")) {
+ return;
+ }
// validate runtime image
Path java = Paths.get("myimage", "bin", "java");
@@ -130,12 +134,7 @@
// validate the image linked with the proper MR version
- if (version.equalsIgnoreOptional(Runtime.version())) {
- ProcessTools.executeProcess(java.toString(), "-cp", System.getProperty("test.classes"),
- "CheckRuntimeVersion", String.valueOf(version.major()),
- "java.base", "java.logging", "m1")
- .shouldHaveExitValue(0);
- } else {
+ if (!version.equalsIgnoreOptional(Runtime.version())) {
ProcessTools.executeProcess(java.toString(), "-cp", System.getProperty("test.classes"),
"CheckRuntimeVersion", String.valueOf(version.major()),
"java.base", "m1")
@@ -151,13 +150,19 @@
return Runtime.Version.parse(mref.descriptor().version().get().toString());
}
- private void jlink(String jar, String image) {
+ private boolean jlink(String jar, String image) {
List args = List.of("--output", image,
"--add-modules", "m1",
"--module-path",
getJmods().toString() + File.pathSeparator + jar);
System.out.println("jlink " + args.stream().collect(Collectors.joining(" ")));
int exitCode = JLINK_TOOL.run(System.out, System.err, args.toArray(new String[0]));
- Assert.assertEquals(exitCode, 0);
+ boolean isJDK9 = System.getProperty("java9.home") != null;
+ if (isJDK9) {
+ Assert.assertNotEquals(exitCode, 0);
+ } else {
+ Assert.assertEquals(exitCode, 0);
+ }
+ return isJDK9;
}
}