comparison src/share/vm/prims/jvmtiExport.cpp @ 4970:33df1aeaebbf

Merge with http://hg.openjdk.java.net/hsx/hsx24/hotspot/
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Mon, 27 Feb 2012 13:10:13 +0100
parents 4ceaf61479fc
children d2a62e0f25eb
comparison
equal deleted inserted replaced
4703:2cfb7fb2dce7 4970:33df1aeaebbf
536 _curr_len = *end_ptr - *data_ptr; 536 _curr_len = *end_ptr - *data_ptr;
537 _curr_data = *data_ptr; 537 _curr_data = *data_ptr;
538 _curr_env = NULL; 538 _curr_env = NULL;
539 _cached_length_ptr = cached_length_ptr; 539 _cached_length_ptr = cached_length_ptr;
540 _cached_data_ptr = cached_data_ptr; 540 _cached_data_ptr = cached_data_ptr;
541 *_cached_length_ptr = 0;
542 *_cached_data_ptr = NULL;
543 541
544 _state = _thread->jvmti_thread_state(); 542 _state = _thread->jvmti_thread_state();
545 if (_state != NULL) { 543 if (_state != NULL) {
546 _h_class_being_redefined = _state->get_class_being_redefined(); 544 _h_class_being_redefined = _state->get_class_being_redefined();
547 _load_kind = _state->get_class_load_kind(); 545 _load_kind = _state->get_class_load_kind();