diff src/share/vm/prims/jni.cpp @ 12356:359f7e70ae7f

Reduce HotSpot diff and fix previous merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 11 Oct 2013 15:41:33 +0200
parents cefad50507d8
children 096c224171c4
line wrap: on
line diff
--- a/src/share/vm/prims/jni.cpp	Fri Oct 11 10:38:03 2013 +0200
+++ b/src/share/vm/prims/jni.cpp	Fri Oct 11 15:41:33 2013 +0200
@@ -5158,6 +5158,7 @@
     *(JNIEnv**)penv = thread->jni_environment();
 
 #ifdef GRAAL
+    // GraalCompiler needs to have been created in compileBroker.cpp
     GraalCompiler* graal_compiler = GraalCompiler::instance();
     graal_compiler->initialize();
 #endif