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

*** 168,186 ****
--- 168,192 ----
                      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) ||
                                                       "OpenBSD".equals(osName)) &&
                                                       (System.getenv("DISPLAY") == null));
                              }
+                         }
                      } else if (nm.equals("true")) {
                          headless = Boolean.TRUE;
                      } else {
                          headless = Boolean.FALSE;
                      }