Merge
authorsspitsyn
Tue, 13 Sep 2016 21:29:30 +0000
changeset 41091 de3789bb384e
parent 41088 5b35bd6f8fb1 (current diff)
parent 41090 49070c1a537a (diff)
child 41092 c388d897472d
Merge
--- a/hotspot/src/share/vm/prims/jvmtiEventController.cpp	Tue Sep 13 18:22:21 2016 +0000
+++ b/hotspot/src/share/vm/prims/jvmtiEventController.cpp	Tue Sep 13 21:29:30 2016 +0000
@@ -96,7 +96,7 @@
 static const jlong  THREAD_FILTERED_EVENT_BITS = INTERP_EVENT_BITS | EXCEPTION_BITS | MONITOR_BITS |
                                         BREAKPOINT_BIT | CLASS_LOAD_BIT | CLASS_PREPARE_BIT | THREAD_END_BIT;
 static const jlong  NEED_THREAD_LIFE_EVENTS = THREAD_FILTERED_EVENT_BITS | THREAD_START_BIT;
-static const jlong  EARLY_EVENT_BITS = CLASS_FILE_LOAD_HOOK_BIT |
+static const jlong  EARLY_EVENT_BITS = CLASS_FILE_LOAD_HOOK_BIT | CLASS_LOAD_BIT | CLASS_PREPARE_BIT |
                                VM_START_BIT | VM_INIT_BIT | VM_DEATH_BIT | NATIVE_METHOD_BIND_BIT |
                                THREAD_START_BIT | THREAD_END_BIT |
                                COMPILED_METHOD_LOAD_BIT | COMPILED_METHOD_UNLOAD_BIT |