changeset 52994:84cc04e403ab

8214552: Resolve clash between 4947890 and 8130264 Reviewed-by: rriggs, mchung
author prr
date Fri, 30 Nov 2018 12:21:39 -0800
parents 98792298b309
children df92f1126c58
files src/java.base/share/classes/jdk/internal/util/SystemProps.java test/jdk/java/awt/print/PrinterJob/CheckPrinterJobSystemProperty.java
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.base/share/classes/jdk/internal/util/SystemProps.java	Fri Nov 30 10:55:59 2018 -0800
+++ b/src/java.base/share/classes/jdk/internal/util/SystemProps.java	Fri Nov 30 12:21:39 2018 -0800
@@ -90,7 +90,6 @@
         putIfAbsent(props, "socksNonProxyHosts", raw.propDefault(Raw._socksNonProxyHosts_NDX));
         putIfAbsent(props, "awt.toolkit", raw.propDefault(Raw._awt_toolkit_NDX));
         putIfAbsent(props, "java.awt.headless", raw.propDefault(Raw._java_awt_headless_NDX));
-        putIfAbsent(props, "java.awt.printerjob", raw.propDefault(Raw._java_awt_printerjob_NDX));
         putIfAbsent(props, "java.awt.graphicsenv", raw.propDefault(Raw._java_awt_graphicsenv_NDX));
         putIfAbsent(props, "sun.desktop", raw.propDefault(Raw._sun_desktop_NDX));
         putIfAbsent(props, "sun.java2d.fontpath", raw.propDefault(Raw._sun_java2d_fontpath_NDX));
@@ -204,8 +203,7 @@
         @Native private static final int _https_proxyHost_NDX = 1 + _http_proxyPort_NDX;
         @Native private static final int _https_proxyPort_NDX = 1 + _https_proxyHost_NDX;
         @Native private static final int _java_awt_graphicsenv_NDX = 1 + _https_proxyPort_NDX;
-        @Native private static final int _java_awt_printerjob_NDX = 1 + _java_awt_graphicsenv_NDX;
-        @Native private static final int _java_awt_headless_NDX = 1 + _java_awt_printerjob_NDX;
+        @Native private static final int _java_awt_headless_NDX = 1 + _java_awt_graphicsenv_NDX;
         @Native private static final int _java_io_tmpdir_NDX = 1 + _java_awt_headless_NDX;
         @Native private static final int _line_separator_NDX = 1 + _java_io_tmpdir_NDX;
         @Native private static final int _os_arch_NDX = 1 + _line_separator_NDX;
--- a/test/jdk/java/awt/print/PrinterJob/CheckPrinterJobSystemProperty.java	Fri Nov 30 10:55:59 2018 -0800
+++ b/test/jdk/java/awt/print/PrinterJob/CheckPrinterJobSystemProperty.java	Fri Nov 30 12:21:39 2018 -0800
@@ -24,7 +24,7 @@
 /**
  * @test
  * @run CheckPrinterJobSystemProperty
- * @bug 8130264
+ * @bug 8130264 8214552
  * @summary verify the PrinterJob implementation class name is not
  *          polluting system properties
  */