--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp	Wed Apr 27 11:40:43 2016 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp	Thu Apr 28 00:36:46 2016 -0700
@@ -667,7 +667,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;