changeset 17375:65cce978b3b5

Merge
author henryjen
date Mon, 22 May 2017 09:32:30 -0700
parents c15f91b2087e 490393b435bb
children 6c683034d1b5
files make/data/docs-resources/specs/resources/jdk-default.css
diffstat 12 files changed, 174 insertions(+), 181 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri May 19 11:17:27 2017 +0100
+++ b/.hgtags	Mon May 22 09:32:30 2017 -0700
@@ -412,3 +412,4 @@
 7828aedcb525df40b7c8122bcc3f997c75ebaf7f jdk-9+167
 e78da9db6299b3fcba49300d52e2359e82fdd218 jdk-9+168
 177436a54ca13730ffc725a6e5dbfcd9486f3da3 jdk-9+169
+ef9954f6896bb0b95ac62bf769f68b59a7a56ccd jdk-9+170
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make/data/docs-resources/resources/jdk-default.css	Mon May 22 09:32:30 2017 -0700
@@ -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;
+}
--- a/make/data/docs-resources/specs/resources/jdk-default.css	Fri May 19 11:17:27 2017 +0100
+++ /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;
-}
--- a/make/src/classes/build/tools/docs/docs-bundle-page.html	Fri May 19 11:17:27 2017 +0100
+++ b/make/src/classes/build/tools/docs/docs-bundle-page.html	Mon May 22 09:32:30 2017 -0700
@@ -27,42 +27,12 @@
 <html lang="en">
 <head>
   <meta http-equiv="content-type" content="text/html;" charset="utf-8">
+  <link rel="stylesheet" href="resources/jdk-default.css" type="text/css" />
   <style type="text/css">
-table {
-  border-collapse: collapse;
-}
-table {
-  border: 1px solid black;
-}
-th ,td {
-  border: 0px solid black;
-}
-thead th {
-  background-color: #DDD;
-}
-tbody > tr:nth-child(even) {
-    background-color: #EEE
-}
-tbody > tr:nth-child(odd) {
-    background-color: #FFF
-}
-th, td {
-  font-family: sans-serif; /* could eventually be DejaVu */
-  font-size: small;
-  padding: 5px 10px;
-  vertical-align:top;
-}
-td a {
-  text-decoration: none;
-}
-tr th {
-  text-align:left;
-}
-caption {
-  font-size: smaller;
-  font-weight: bold;
-}
-</style>
+    caption {
+      text-align: center;
+    }
+  </style>
 <title>@HEADER_TITLE@</title>
 </head>
 <body>
@@ -127,10 +97,10 @@
   <td>@JAVA_EE_MODULES@</td>
 </tr>
 <tr>
-  <th scope="row"></th>
-  <th scope="row">Outside Java SE</th>
-  <th scope="row">JDK</th>
-  <th scope="row">JavaFX</th>
+  <th scope="col"></th>
+  <th scope="col">Outside Java SE</th>
+  <th scope="col">JDK</th>
+  <th scope="col">JavaFX</th>
 </tr>
 <tr>
   <th scope="row">Others</th>
--- a/make/src/classes/build/tools/taglet/ExtLink.java	Fri May 19 11:17:27 2017 +0100
+++ b/make/src/classes/build/tools/taglet/ExtLink.java	Mon May 22 09:32:30 2017 -0700
@@ -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&amp;id=";
 
     static final Pattern TAG_PATTERN = Pattern.compile("(\\s*)(?<name>\\w+)(\\s+)(?<desc>.*)");
 
--- a/src/java.base/aix/native/libnet/aix_close.c	Fri May 19 11:17:27 2017 +0100
+++ b/src/java.base/aix/native/libnet/aix_close.c	Mon May 22 09:32:30 2017 -0700
@@ -419,10 +419,8 @@
 }
 
 int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
-       struct sockaddr *from, int *fromlen) {
-    socklen_t socklen = *fromlen;
-    BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, &socklen) );
-    *fromlen = socklen;
+       struct sockaddr *from, socklen_t *fromlen) {
+    BLOCKING_IO_RETURN_INT( s, recvfrom(s, buf, len, flags, from, fromlen) );
 }
 
 int NET_Send(int s, void *msg, int len, unsigned int flags) {
@@ -438,10 +436,8 @@
     BLOCKING_IO_RETURN_INT( s, sendto(s, msg, len, flags, to, tolen) );
 }
 
-int NET_Accept(int s, struct sockaddr *addr, int *addrlen) {
-    socklen_t socklen = *addrlen;
-    BLOCKING_IO_RETURN_INT( s, accept(s, addr, &socklen) );
-    *addrlen = socklen;
+int NET_Accept(int s, struct sockaddr *addr, socklen_t *addrlen) {
+    BLOCKING_IO_RETURN_INT( s, accept(s, addr, addrlen) );
 }
 
 int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
--- a/src/java.base/share/classes/java/io/File.java	Fri May 19 11:17:27 2017 +0100
+++ b/src/java.base/share/classes/java/io/File.java	Mon May 22 09:32:30 2017 -0700
@@ -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 <code>long</code> value representing the time the file was
      *          last modified, measured in milliseconds since the epoch
      *          (00:00:00 GMT, January 1, 1970), or <code>0L</code> if the
--- a/src/java.base/share/classes/javax/crypto/Cipher.java	Fri May 19 11:17:27 2017 +0100
+++ b/src/java.base/share/classes/javax/crypto/Cipher.java	Mon May 22 09:32:30 2017 -0700
@@ -137,6 +137,7 @@
  * <li>{@code AES/CBC/PKCS5Padding} (128)</li>
  * <li>{@code AES/ECB/NoPadding} (128)</li>
  * <li>{@code AES/ECB/PKCS5Padding} (128)</li>
+ * <li>{@code AES/GCM/NoPadding} (128)</li>
  * <li>{@code DES/CBC/NoPadding} (56)</li>
  * <li>{@code DES/CBC/PKCS5Padding} (56)</li>
  * <li>{@code DES/ECB/NoPadding} (56)</li>
--- a/src/java.base/share/native/libjli/args.c	Fri May 19 11:17:27 2017 +0100
+++ b/src/java.base/share/native/libjli/args.c	Mon May 22 09:32:30 2017 -0700
@@ -456,6 +456,11 @@
             env++;
         }
 
+        // Trailing space
+        if (*env == '\0') {
+            break;
+        }
+
         arg = p;
         while (*env != '\0' && !isspace(*env)) {
             if (*env == '"' || *env == '\'') {
--- a/src/java.base/share/native/libjli/emessages.h	Fri May 19 11:17:27 2017 +0100
+++ b/src/java.base/share/native/libjli/emessages.h	Mon May 22 09:32:30 2017 -0700
@@ -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"
--- a/test/java/lang/ClassLoader/Assert.java	Fri May 19 11:17:27 2017 +0100
+++ b/test/java/lang/ClassLoader/Assert.java	Mon May 22 09:32:30 2017 -0700
@@ -28,7 +28,7 @@
  * @run main/othervm Assert
  * @summary Test the assertion facility
  * @author Mike McCloskey
- * @key randomness intermittent
+ * @key randomness
  */
 
 import package1.*;
--- a/test/tools/launcher/ArgsEnvVar.java	Fri May 19 11:17:27 2017 +0100
+++ b/test/tools/launcher/ArgsEnvVar.java	Mon May 22 09:32:30 2017 -0700
@@ -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 @@
         }
     }
 }
-