stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Phil Race 2017-05-22 08:54:59 -07:00
commit a89cb1d937
10 changed files with 46 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jdk/.hgtags
View File

@ -412,3 +412,4 @@ a7942c3b1e59495dbf51dc7c41aab355fcd253d7 jdk-9+165
7828aedcb525df40b7c8122bcc3f997c75ebaf7f jdk-9+167
e78da9db6299b3fcba49300d52e2359e82fdd218 jdk-9+168
177436a54ca13730ffc725a6e5dbfcd9486f3da3 jdk-9+169
ef9954f6896bb0b95ac62bf769f68b59a7a56ccd jdk-9+170

4
jdk/make/data/docs-resources/specs/resources/jdk-default.css → jdk/make/data/docs-resources/resources/jdk-default.css
View File

@ -116,11 +116,11 @@ caption {
margin-bottom:10px;
}
tr:nth-child(even) {
tr:nth-child(even), tr:nth-child(even) th[scope=row] {
background: #DDD;
}
tr:nth-child(odd) {
tr:nth-child(odd), tr:nth-child(odd) th[scope=row] {
background: #FFF;
}

48
jdk/make/src/classes/build/tools/docs/docs-bundle-page.html
View File

@ -27,42 +27,12 @@ questions.
<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 @@ caption {
<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>

2
jdk/make/src/classes/build/tools/taglet/ExtLink.java
View File

@ -56,7 +56,7 @@ public class ExtLink implements Taglet {
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>.*)");

12
jdk/src/java.base/aix/native/libnet/aix_close.c
View File

@ -419,10 +419,8 @@ int NET_ReadV(int s, const struct iovec * vector, int count) {
}
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 @@ int NET_SendTo(int s, const void *msg, int len, unsigned int
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) {

6
jdk/src/java.base/share/classes/java/io/File.java
View File

@ -923,6 +923,12 @@ public class File
* 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

5
jdk/src/java.base/share/native/libjli/args.c
View File

@ -456,6 +456,11 @@ jboolean JLI_AddArgsFromEnvVar(JLI_List args, const char *var_name) {
env++;
}
// Trailing space
if (*env == '\0') {
break;
}
arg = p;
while (*env != '\0' && !isspace(*env)) {
if (*env == '"' || *env == '\'') {

2
jdk/src/java.base/share/native/libjli/emessages.h
View File

@ -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"

2
jdk/test/java/lang/ClassLoader/Assert.java
View File

@ -28,7 +28,7 @@
* @run main/othervm Assert
* @summary Test the assertion facility
* @author Mike McCloskey
* @key randomness intermittent
* @key randomness
*/
import package1.*;

18
jdk/test/tools/launcher/ArgsEnvVar.java
View File

@ -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 @@ public class ArgsEnvVar extends TestHelper {
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 @@ public class ArgsEnvVar extends TestHelper {
}
}
}