archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 23:34:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge

Browse source
This commit is contained in:
Henry Jen 2018-12-13 11:47:35 -08:00
commit d77f96b0b2
684 changed files with 47732 additions and 20486 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/java.base/unix/classes/java/lang/ProcessImpl.java
View file

@ -412,7 +412,7 @@ final class ProcessImpl extends Process {
new BufferedOutputStream(
new FileOutputStream(newFileDescriptor(fds[0])));
stdout = (fds[1] == -1) ?
stdout = (fds[1] == -1 || forceNullOutputStream) ?
ProcessBuilder.NullInputStream.INSTANCE :
new BufferedInputStream(
stdout_inner_stream =
@ -446,7 +446,7 @@ final class ProcessImpl extends Process {
ProcessBuilder.NullOutputStream.INSTANCE :
new ProcessPipeOutputStream(fds[0]);
stdout = (fds[1] == -1) ?
stdout = (fds[1] == -1 || forceNullOutputStream) ?
ProcessBuilder.NullInputStream.INSTANCE :
new DeferredCloseProcessPipeInputStream(fds[1]);

4
src/java.base/unix/native/libjava/java_props_md.c
View file

@ -407,10 +407,6 @@ GetJavaProperties(JNIEnv *env)
sprops.awt_toolkit = "sun.awt.X11.XToolkit";
#endif
/* This is used only for debugging of font problems. */
v = getenv("JAVA2D_FONTPATH");
sprops.font_dir = v ? v : NULL;
#ifdef SI_ISALIST
/* supported instruction sets */
{