# HG changeset patch # User lana # Date 1495126117 0 # Node ID fb4fe30c9375c5d9eac65bf09c6186b60777e8e3 # Parent e9ec1a7e728e47e3f843cb2c5ee4c4c08f1a93ad# Parent 0488e2d102963f9171acfd8fd7c85d7a22e8e83f Merge diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/make/data/docs-resources/resources/jdk-default.css --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/make/data/docs-resources/resources/jdk-default.css Thu May 18 16:48:37 2017 +0000 @@ -0,0 +1,129 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +body { + margin: 2em 2em; + font-family: DejaVu Sans, Bitstream Vera Sans, Luxi Sans, Verdana, Arial, Helvetica; + font-size: 10pt; + line-height: 1.4; +} + +pre, code, tt { + font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono, + Courier New, monospace; +} + +blockquote { + margin: 1.5ex 0em 1.5ex 2em; +} + +p { + padding: 0pt; + margin: 1ex 0em; +} + +p:first-child, pre:first-child { margin-top: 0pt; } + +h1 { + font-weight: bold; + padding: 0pt; + margin: 2ex .5ex 1ex 0pt; +} + +h1:first-child, h2:first-child { + margin-top: 0ex; +} + +h2 { + font-weight: bold; + padding: 0pt; + margin: 2ex 0pt 1ex 0pt; +} + +h3 { + font-weight: bold; + padding: 0pt; + margin: 1.5ex 0pt 1ex 0pt; +} + +h4 { + font-weight: bold; + padding: 0pt; + margin: 1.5ex 0pt 1ex 0pt; +} + +a:link { + color: #437291; +} + +a:visited { + color: #666666; +} + +a[href]:hover { + color: #e76f00; +} + +a img { + border-width: 0px; +} + +img { + background: white; +} + +table { + border-collapse: collapse; + margin-left: 15px; + margin-right: 15px; +} + +th, td { + padding: 3px; + vertical-align: top; +} + +table, th, td { + border: 1px solid black; +} + +caption { + text-align: left; + font-style: italic; + text-indent: 15px; + margin-bottom:10px; +} + +tr:nth-child(even), tr:nth-child(even) th[scope=row] { + background: #DDD; +} + +tr:nth-child(odd), tr:nth-child(odd) th[scope=row] { + background: #FFF; +} + +th { + background: #DDF; +} diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/make/data/docs-resources/specs/resources/jdk-default.css --- a/jdk/make/data/docs-resources/specs/resources/jdk-default.css Thu May 18 14:54:54 2017 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,129 +0,0 @@ -/* - * 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. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * 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. - */ - -body { - margin: 2em 2em; - font-family: DejaVu Sans, Bitstream Vera Sans, Luxi Sans, Verdana, Arial, Helvetica; - font-size: 10pt; - line-height: 1.4; -} - -pre, code, tt { - font-family: DejaVu Sans Mono, Bitstream Vera Sans Mono, Luxi Mono, - Courier New, monospace; -} - -blockquote { - margin: 1.5ex 0em 1.5ex 2em; -} - -p { - padding: 0pt; - margin: 1ex 0em; -} - -p:first-child, pre:first-child { margin-top: 0pt; } - -h1 { - font-weight: bold; - padding: 0pt; - margin: 2ex .5ex 1ex 0pt; -} - -h1:first-child, h2:first-child { - margin-top: 0ex; -} - -h2 { - font-weight: bold; - padding: 0pt; - margin: 2ex 0pt 1ex 0pt; -} - -h3 { - font-weight: bold; - padding: 0pt; - margin: 1.5ex 0pt 1ex 0pt; -} - -h4 { - font-weight: bold; - padding: 0pt; - margin: 1.5ex 0pt 1ex 0pt; -} - -a:link { - color: #437291; -} - -a:visited { - color: #666666; -} - -a[href]:hover { - color: #e76f00; -} - -a img { - border-width: 0px; -} - -img { - background: white; -} - -table { - border-collapse: collapse; - margin-left: 15px; - margin-right: 15px; -} - -th, td { - padding: 3px; - vertical-align: top; -} - -table, th, td { - border: 1px solid black; -} - -caption { - text-align: left; - font-style: italic; - text-indent: 15px; - margin-bottom:10px; -} - -tr:nth-child(even) { - background: #DDD; -} - -tr:nth-child(odd) { - background: #FFF; -} - -th { - background: #DDF; -} diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/make/src/classes/build/tools/docs/docs-bundle-page.html --- a/jdk/make/src/classes/build/tools/docs/docs-bundle-page.html Thu May 18 14:54:54 2017 +0000 +++ b/jdk/make/src/classes/build/tools/docs/docs-bundle-page.html Thu May 18 16:48:37 2017 +0000 @@ -27,42 +27,12 @@ + + caption { + text-align: center; + } + @HEADER_TITLE@ @@ -127,10 +97,10 @@ @JAVA_EE_MODULES@ - - Outside Java SE - JDK - JavaFX + + Outside Java SE + JDK + JavaFX Others diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/make/src/classes/build/tools/taglet/ExtLink.java --- a/jdk/make/src/classes/build/tools/taglet/ExtLink.java Thu May 18 14:54:54 2017 +0000 +++ b/jdk/make/src/classes/build/tools/taglet/ExtLink.java Thu May 18 16:48:37 2017 +0000 @@ -56,7 +56,7 @@ static final String TAG_NAME = "extLink"; - static final String URL = "https://www.oracle.com/pls/topic/lookup?ctx=javase9&id="; + static final String URL = "https://www.oracle.com/pls/topic/lookup?ctx=javase9&id="; static final Pattern TAG_PATTERN = Pattern.compile("(\\s*)(?\\w+)(\\s+)(?.*)"); diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/src/java.base/share/classes/java/io/File.java --- a/jdk/src/java.base/share/classes/java/io/File.java Thu May 18 14:54:54 2017 +0000 +++ b/jdk/src/java.base/share/classes/java/io/File.java Thu May 18 16:48:37 2017 +0000 @@ -923,6 +923,12 @@ * java.nio.file.Files#readAttributes(Path,Class,LinkOption[]) * Files.readAttributes} method may be used. * + * @apiNote + * While the unit of time of the return value is milliseconds, + * the granularity of the value depends on the underlying + * file system and may be larger. For example, some + * file systems use time stamps in units of seconds. + * * @return A long value representing the time the file was * last modified, measured in milliseconds since the epoch * (00:00:00 GMT, January 1, 1970), or 0L if the diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/src/java.base/share/classes/javax/crypto/Cipher.java --- a/jdk/src/java.base/share/classes/javax/crypto/Cipher.java Thu May 18 14:54:54 2017 +0000 +++ b/jdk/src/java.base/share/classes/javax/crypto/Cipher.java Thu May 18 16:48:37 2017 +0000 @@ -137,6 +137,7 @@ *
  • {@code AES/CBC/PKCS5Padding} (128)
    • *
  • {@code AES/ECB/NoPadding} (128)
    • *
  • {@code AES/ECB/PKCS5Padding} (128)
    • + *
  • {@code AES/GCM/NoPadding} (128)
    • *
  • {@code DES/CBC/NoPadding} (56)
    • *
  • {@code DES/CBC/PKCS5Padding} (56)
    • *
  • {@code DES/ECB/NoPadding} (56)
    • diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/src/java.base/share/native/libjli/args.c --- a/jdk/src/java.base/share/native/libjli/args.c Thu May 18 14:54:54 2017 +0000 +++ b/jdk/src/java.base/share/native/libjli/args.c Thu May 18 16:48:37 2017 +0000 @@ -456,6 +456,11 @@ env++; } + // Trailing space + if (*env == '\0') { + break; + } + arg = p; while (*env != '\0' && !isspace(*env)) { if (*env == '"' || *env == '\'') { diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/src/java.base/share/native/libjli/emessages.h --- a/jdk/src/java.base/share/native/libjli/emessages.h Thu May 18 14:54:54 2017 +0000 +++ b/jdk/src/java.base/share/native/libjli/emessages.h Thu May 18 16:48:37 2017 +0000 @@ -36,7 +36,7 @@ #define JNI_ERROR "Error: A JNI error has occurred, please check your installation and try again" #define JNI_ERROR1 "Error: can't find JNI interfaces in: %s" -#define ARG_INFO_ENVVAR "NOTE: Picked up the following options via %s:\n %s" +#define ARG_INFO_ENVVAR "NOTE: Picked up %s: %s" #define ARG_WARN "Warning: %s option is no longer supported." #define ARG_ERROR1 "Error: %s requires class path specification" diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/test/java/nio/channels/Selector/SelectAndClose.java --- a/jdk/test/java/nio/channels/Selector/SelectAndClose.java Thu May 18 14:54:54 2017 +0000 +++ b/jdk/test/java/nio/channels/Selector/SelectAndClose.java Thu May 18 16:48:37 2017 +0000 @@ -23,7 +23,6 @@ /* @test * @bug 5004077 - * @key intermittent * @summary Check blocking of select and close */ diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/test/java/nio/channels/Selector/WakeupAfterClose.java --- a/jdk/test/java/nio/channels/Selector/WakeupAfterClose.java Thu May 18 14:54:54 2017 +0000 +++ b/jdk/test/java/nio/channels/Selector/WakeupAfterClose.java Thu May 18 16:48:37 2017 +0000 @@ -24,7 +24,6 @@ /* @test * @bug 6524172 * @summary Invoking wakeup on closed Selector can throw NPE if close resets interrupt status - * @key intermittent */ import java.io.IOException; diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/test/javax/sound/sampled/Clip/ClipCloseLoss.java --- a/jdk/test/javax/sound/sampled/Clip/ClipCloseLoss.java Thu May 18 14:54:54 2017 +0000 +++ b/jdk/test/javax/sound/sampled/Clip/ClipCloseLoss.java Thu May 18 16:48:37 2017 +0000 @@ -36,6 +36,7 @@ * @bug 4946913 * @summary DirectClip doesn't kill the thread correctly, sometimes * @run main/othervm ClipCloseLoss + * @key intermittent */ public class ClipCloseLoss { static int frameCount = 441000; // lets say 10 seconds diff -r e9ec1a7e728e -r fb4fe30c9375 jdk/test/tools/launcher/ArgsEnvVar.java --- a/jdk/test/tools/launcher/ArgsEnvVar.java Thu May 18 14:54:54 2017 +0000 +++ b/jdk/test/tools/launcher/ArgsEnvVar.java Thu May 18 16:48:37 2017 +0000 @@ -23,7 +23,7 @@ /** * @test - * @bug 8170832 + * @bug 8170832 8180447 * @summary Arguments passed in environment variable * @build TestHelper * @run main ArgsEnvVar @@ -224,6 +224,21 @@ verifyOptions(List.of("-p", "?", "-jar", "test.jar", "one", "two"), tr); } + @Test + public void testTrailingSpaces() { + env.put(JDK_JAVA_OPTIONS, "--add-exports java.base/jdk.internal.misc=ALL-UNNAMED "); + TestResult tr = doExec(env, javaCmd, "-jar", "test.jar"); + verifyOptions(List.of("--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED", "-jar", "test.jar"), tr); + + env.put(JDK_JAVA_OPTIONS, "--class-path ' '"); + tr = doExec(env, javaCmd, "-jar", "test.jar"); + verifyOptions(List.of("--class-path", " ", "-jar", "test.jar"), tr); + + env.put(JDK_JAVA_OPTIONS, " --add-exports java.base/jdk.internal.misc=ALL-UNNAMED "); + tr = doExec(env, javaCmd, "-jar", "test.jar"); + verifyOptions(List.of("--add-exports", "java.base/jdk.internal.misc=ALL-UNNAMED", "-jar", "test.jar"), tr); + } + public static void main(String... args) throws Exception { init(); ArgsEnvVar a = new ArgsEnvVar(); @@ -236,4 +251,3 @@ } } } -