1.1 --- a/src/share/vm/prims/jvmtiExport.cpp Thu Jan 27 13:42:28 2011 -0800
1.2 +++ b/src/share/vm/prims/jvmtiExport.cpp Thu Jan 27 16:11:27 2011 -0800
1.3 @@ -268,9 +268,9 @@
1.4 jclass _class_being_redefined;
1.5
1.6 public:
1.7 - JvmtiClassFileLoadEventMark(JavaThread *thread, symbolHandle name,
1.8 + JvmtiClassFileLoadEventMark(JavaThread *thread, Symbol* name,
1.9 Handle class_loader, Handle prot_domain, KlassHandle *class_being_redefined) : JvmtiThreadEventMark(thread) {
1.10 - _class_name = name() != NULL? name->as_utf8() : NULL;
1.11 + _class_name = name != NULL? name->as_utf8() : NULL;
1.12 _jloader = (jobject)to_jobject(class_loader());
1.13 _protection_domain = (jobject)to_jobject(prot_domain());
1.14 if (class_being_redefined == NULL) {
1.15 @@ -506,7 +506,7 @@
1.16
1.17 class JvmtiClassFileLoadHookPoster : public StackObj {
1.18 private:
1.19 - symbolHandle _h_name;
1.20 + Symbol* _h_name;
1.21 Handle _class_loader;
1.22 Handle _h_protection_domain;
1.23 unsigned char ** _data_ptr;
1.24 @@ -522,7 +522,7 @@
1.25 JvmtiClassLoadKind _load_kind;
1.26
1.27 public:
1.28 - inline JvmtiClassFileLoadHookPoster(symbolHandle h_name, Handle class_loader,
1.29 + inline JvmtiClassFileLoadHookPoster(Symbol* h_name, Handle class_loader,
1.30 Handle h_protection_domain,
1.31 unsigned char **data_ptr, unsigned char **end_ptr,
1.32 unsigned char **cached_data_ptr,
1.33 @@ -597,7 +597,7 @@
1.34 // EVT_TRACE(JVMTI_EVENT_CLASS_FILE_LOAD_HOOK,
1.35 // ("JVMTI [%s] class file load hook event sent %s data_ptr = %d, data_len = %d",
1.36 // JvmtiTrace::safe_get_thread_name(_thread),
1.37 -// _h_name.is_null() ? "NULL" : _h_name->as_utf8(),
1.38 +// _h_name == NULL ? "NULL" : _h_name->as_utf8(),
1.39 // _curr_data, _curr_len ));
1.40 JvmtiClassFileLoadEventMark jem(_thread, _h_name, _class_loader,
1.41 _h_protection_domain,
1.42 @@ -655,7 +655,7 @@
1.43 bool JvmtiExport::_should_post_class_file_load_hook = false;
1.44
1.45 // this entry is for class file load hook on class load, redefine and retransform
1.46 -void JvmtiExport::post_class_file_load_hook(symbolHandle h_name,
1.47 +void JvmtiExport::post_class_file_load_hook(Symbol* h_name,
1.48 Handle class_loader,
1.49 Handle h_protection_domain,
1.50 unsigned char **data_ptr,
