--- a/src/share/vm/prims/jni.cpp	Wed Nov 16 16:46:32 2011 +0100
+++ b/src/share/vm/prims/jni.cpp	Wed Nov 16 21:27:28 2011 +0100
@@ -3361,6 +3361,12 @@
     *vm = (JavaVM *)(&main_vm);
     *(JNIEnv**)penv = thread->jni_environment();
 
+    if (UseGraal) {
+      GraalCompiler* compiler = GraalCompiler::instance();
+      ciObjectFactory::initialize(); 
+      compiler->initialize();
+    }
+
     // Tracks the time application was running before GC
     RuntimeService::record_application_start();
 
@@ -3369,10 +3375,6 @@
        JvmtiExport::post_thread_start(thread);
     }
 
-    if (UseGraal && BootstrapGraal) {
-      CompileBroker::bootstrap_graal();
-    }
-
     // Check if we should compile all classes on bootclasspath
     NOT_PRODUCT(if (CompileTheWorld) ClassLoader::compile_the_world();)
     // Since this is not a JVM_ENTRY we have to set the thread state manually before leaving.