--- old/src/share/vm/prims/jvmtiExport.cpp	2016-04-14 01:07:58.942573058 -0700
+++ new/src/share/vm/prims/jvmtiExport.cpp	2016-04-14 01:07:58.790565479 -0700
@@ -665,7 +665,7 @@
   }
 
   void post_to_env(JvmtiEnv* env, bool caching_needed) {
-    if (env->phase() == JVMTI_PHASE_PRIMORDIAL) {
+    if (env->phase() == JVMTI_PHASE_PRIMORDIAL && !env->early_class_hook_env()) {
       return;
     }
     unsigned char *new_data = NULL;