--- a/jdk/src/solaris/native/java/lang/java_props_md.c	Tue Aug 07 12:47:45 2012 +0100
+++ b/jdk/src/solaris/native/java/lang/java_props_md.c	Tue Aug 07 20:23:41 2012 -0700
@@ -431,6 +431,7 @@
     PreferredToolkit prefToolkit = getPreferredToolkit();
     switch (prefToolkit) {
         case CToolkit:
+        case HToolkit:
             sprops.graphics_env = "sun.awt.CGraphicsEnvironment";
             break;
         case XToolkit:
@@ -438,9 +439,6 @@
     sprops.graphics_env = "sun.awt.X11GraphicsEnvironment";
 #ifdef MACOSX
             break;
-        default:
-            sprops.graphics_env = "sun.java2d.HeadlessGraphicsEnvironment";
-            break;
     }
 #endif
     /* AWT properties */