--- a/jdk/src/share/classes/java/awt/GraphicsEnvironment.java Thu Jul 19 19:09:30 2012 +0400
+++ b/jdk/src/share/classes/java/awt/GraphicsEnvironment.java Thu Jul 19 19:41:59 2012 +0400
@@ -170,12 +170,12 @@
if (System.getProperty("javaplugin.version") != null) {
headless = defaultHeadless = Boolean.FALSE;
} else {
- if ("sun.awt.HeadlessGraphicsEnvironment".equals(
- System.getProperty("java.awt.graphicsenv")))
+ String osName = System.getProperty("os.name");
+ if (osName.contains("OS X") && "sun.awt.HToolkit".equals(
+ System.getProperty("awt.toolkit")))
{
headless = defaultHeadless = Boolean.TRUE;
} else {
- String osName = System.getProperty("os.name");
headless = defaultHeadless =
Boolean.valueOf(("Linux".equals(osName) ||
"SunOS".equals(osName) ||
--- a/jdk/src/solaris/native/java/lang/java_props_md.c Thu Jul 19 19:09:30 2012 +0400
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c Thu Jul 19 19:41:59 2012 +0400
@@ -398,6 +398,7 @@
PreferredToolkit prefToolkit = getPreferredToolkit();
switch (prefToolkit) {
case CToolkit:
+ case HToolkit:
sprops.graphics_env = "sun.awt.CGraphicsEnvironment";
break;
case XToolkit:
@@ -405,9 +406,6 @@
sprops.graphics_env = "sun.awt.X11GraphicsEnvironment";
#ifdef MACOSX
break;
- default:
- sprops.graphics_env = "sun.java2d.HeadlessGraphicsEnvironment";
- break;
}
#endif
/* AWT properties */