changeset 23001:37d4d581f698

Merge
author coleenp
date Sat, 02 May 2015 00:20:54 +0000
parents 7a4abf4cbade (current diff) 9dc350b9e498 (diff)
children 0f0188a02ecb
files
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/interpreter/interpreterRuntime.cpp	Tue Feb 18 09:54:24 2014 -0500
+++ b/src/share/vm/interpreter/interpreterRuntime.cpp	Sat May 02 00:20:54 2015 +0000
@@ -1306,6 +1306,8 @@
       member_name_oop = java_lang_invoke_DirectMethodHandle::member(member_name_oop);
     }
     thread->set_vm_result(member_name_oop);
+  } else {
+    thread->set_vm_result(NULL);
   }
 IRT_END
 #endif // INCLUDE_JVMTI