src/share/classes/java/awt/GraphicsEnvironment.java

*** 168,183 ****
                      if (nm == null) {
                          /* No need to ask for DISPLAY when run in a browser */
                          if (System.getProperty("javaplugin.version") != null) {
                              headless = defaultHeadless = Boolean.FALSE;
                          } else {
!                             if ("sun.awt.HeadlessGraphicsEnvironment".equals(
!                                     System.getProperty("java.awt.graphicsenv")))
                              {
                                  headless = defaultHeadless = Boolean.TRUE;
                              } else {
-                                 String osName = System.getProperty("os.name");
                                  headless = defaultHeadless =
                                      Boolean.valueOf(("Linux".equals(osName) ||
                                                       "SunOS".equals(osName) ||
                                                       "FreeBSD".equals(osName) ||
                                                       "NetBSD".equals(osName) ||
--- 168,183 ----
                      if (nm == null) {
                          /* No need to ask for DISPLAY when run in a browser */
                          if (System.getProperty("javaplugin.version") != null) {
                              headless = defaultHeadless = Boolean.FALSE;
                          } else {
!                             String osName = System.getProperty("os.name");
!                             if (osName.contains("OS X") && "sun.awt.HToolkit".equals(
!                                     System.getProperty("awt.toolkit")))
                              {
                                  headless = defaultHeadless = Boolean.TRUE;
                              } else {
                                  headless = defaultHeadless =
                                      Boolean.valueOf(("Linux".equals(osName) ||
                                                       "SunOS".equals(osName) ||
                                                       "FreeBSD".equals(osName) ||
                                                       "NetBSD".equals(osName) ||