Fixed RedefineClasses recursion when loading via JNI

SAP · Nov 2, 2021 · 3e1e1c6 · 3e1e1c6
1 parent b80d163
commit 3e1e1c6
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/vmEntry.cpp b/src/vmEntry.cpp
@@ -118,7 +118,6 @@ bool VM::init(JavaVM* vm, bool attach) {
  callbacks.MonitorContendedEntered = LockTracer::MonitorContendedEntered;
  _jvmti->SetEventCallbacks(&callbacks, sizeof(callbacks));
 
- _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL);
  _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_DEATH, NULL);
  _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_LOAD, NULL);
  _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_CLASS_PREPARE, NULL);
@@ -131,6 +130,8 @@ bool VM::init(JavaVM* vm, bool attach) {
  DisableSweeper ds;
  _jvmti->GenerateEvents(JVMTI_EVENT_DYNAMIC_CODE_GENERATED);
  _jvmti->GenerateEvents(JVMTI_EVENT_COMPILED_METHOD_LOAD);
+ } else {
+ _jvmti->SetEventNotificationMode(JVMTI_ENABLE, JVMTI_EVENT_VM_INIT, NULL);
  }
 
  if (hotspot_version() > 0 && hotspot_version() < 11) {