--- a/src/share/vm/prims/jni.cpp	Thu Jul 03 21:47:59 2014 +0200
+++ b/src/share/vm/prims/jni.cpp	Thu Jul 03 23:28:35 2014 +0200
@@ -5175,22 +5175,9 @@
     *(JNIEnv**)penv = thread->jni_environment();
 
 #ifdef COMPILERGRAAL
-    if (UseGraalCompilationQueue) {
-      // GraalCompiler may have been created in compileBroker.cpp
-      GraalCompiler* graal_compiler = GraalCompiler::instance();
-      if (ForceGraalInitialization && graal_compiler == NULL) {
-        graal_compiler = new GraalCompiler();
-      }
-      if (graal_compiler != NULL) {
-        graal_compiler->initialize();
-      } else {
-        assert(!UseCompiler, "why isn't there any compiler?");
-      }
-    } else {
-      // Graal is initialized on a CompilerThread
-      if (FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal) {
-        GraalCompiler::instance()->bootstrap();
-      }
+    // Graal is initialized on a CompilerThread
+    if (FLAG_IS_DEFAULT(BootstrapGraal) ? !TieredCompilation : BootstrapGraal) {
+      GraalCompiler::instance()->bootstrap();
     }
 #endif