src/share/vm/classfile/klassFactory.cpp

*** 100,124 ****
  
    assert(stream != NULL, "invariant");
    assert(loader_data != NULL, "invariant");
    assert(THREAD->is_Java_thread(), "must be a JavaThread");
  
-   bool changed_by_loadhook = false;
- 
    ResourceMark rm;
    HandleMark hm;
  
    JvmtiCachedClassFileData* cached_class_file = NULL;
  
    ClassFileStream* old_stream = stream;
  
    stream = prologue(stream,
                      name,
                      loader_data,
                      protection_domain,
                      &cached_class_file,
                      CHECK_NULL);
  
    ClassFileParser parser(stream,
                           name,
                           loader_data,
                           protection_domain,
--- 100,126 ----
  
    assert(stream != NULL, "invariant");
    assert(loader_data != NULL, "invariant");
    assert(THREAD->is_Java_thread(), "must be a JavaThread");
  
    ResourceMark rm;
    HandleMark hm;
  
    JvmtiCachedClassFileData* cached_class_file = NULL;
  
    ClassFileStream* old_stream = stream;
  
+   // VM Anonymous classes - defined via unsafe.DefineAnonymousClass - should not
+   // call back to a CFLH
+   if (host_klass == NULL) {
      stream = prologue(stream,
                        name,
                        loader_data,
                        protection_domain,
                        &cached_class_file,
                        CHECK_NULL);
+   }
  
    ClassFileParser parser(stream,
                           name,
                           loader_data,
                           protection_domain,