--- a/jdk/src/share/bin/java.c	Mon Mar 03 15:44:50 2008 +0100
+++ b/jdk/src/share/bin/java.c	Thu Mar 06 07:51:28 2008 -0800
@@ -205,9 +205,7 @@
     _wc_enabled = cpwildcard;
     _ergo_policy = ergo;
 
-    if (javaw == JNI_TRUE)
-        SetJavaw();
-
+    InitLauncher(javaw);
     DumpState();
 
     /*