diff -r 88d0a8413bb8 -r adb296cc2eae jdk/src/windows/bin/java_md.c --- a/jdk/src/windows/bin/java_md.c Wed Nov 24 15:26:41 2010 -0800 +++ b/jdk/src/windows/bin/java_md.c Thu Nov 25 15:58:11 2010 +0300 @@ -70,7 +70,11 @@ */ #undef ENABLE_AWT_PRELOAD #ifndef JAVA_ARGS /* turn off AWT preloading for javac, jar, etc */ - #define ENABLE_AWT_PRELOAD + /* CR6999872: fastdebug crashes if awt library is loaded before JVM is + * initialized*/ + #if !defined(DEBUG) + #define ENABLE_AWT_PRELOAD + #endif #endif #ifdef ENABLE_AWT_PRELOAD