# HG changeset patch # User rbackman # Date 1368610254 -7200 # Node ID f49e0508a38accd4ef854fbaf51ae006ec3485e3 # Parent 513a5298c1dd7d4ba2ba28f654aa53aa512f4c1f 4965252: JvmtiExport::post_raw_field_modification jni ref handling is odd Reviewed-by: coleenp, sspitsyn diff -r 513a5298c1dd -r f49e0508a38a src/share/vm/prims/jvmtiExport.cpp --- a/src/share/vm/prims/jvmtiExport.cpp Tue May 14 17:33:07 2013 +0000 +++ b/src/share/vm/prims/jvmtiExport.cpp Wed May 15 11:30:54 2013 +0200 @@ -1624,15 +1624,19 @@ } } + assert(sig_type != '[', "array should have sig_type == 'L'"); + bool handle_created = false; + // convert oop to JNI handle. - if (sig_type == 'L' || sig_type == '[') { + if (sig_type == 'L') { + handle_created = true; value->l = (jobject)JNIHandles::make_local(thread, (oop)value->l); } post_field_modification(thread, method, location, field_klass, object, field, sig_type, value); // Destroy the JNI handle allocated above. - if (sig_type == 'L') { + if (handle_created) { JNIHandles::destroy_local(value->l); } }