# HG changeset patch
# User mlarsson
# Date 1460644989 -7200
# Node ID 0cdd4aef147647647295d77de29b07bf2fe60a57
# Parent  14ba6c7e10bf08bc7d9b1fae25d9829b4bde32a6# Parent  1809a72d5cd6ce631d0430849ac1bebf8277123a
Merge

diff -r 14ba6c7e10bf -r 0cdd4aef1476 hotspot/src/share/vm/prims/jvmtiExport.cpp
--- a/hotspot/src/share/vm/prims/jvmtiExport.cpp	Thu Apr 14 14:13:07 2016 +0000
+++ b/hotspot/src/share/vm/prims/jvmtiExport.cpp	Thu Apr 14 16:43:09 2016 +0200
@@ -2260,7 +2260,7 @@
     if (env->is_enabled(JVMTI_EVENT_VM_OBJECT_ALLOC)) {
       EVT_TRACE(JVMTI_EVENT_VM_OBJECT_ALLOC, ("JVMTI [%s] Evt vmobject alloc sent %s",
                                          JvmtiTrace::safe_get_thread_name(thread),
-                                         object==NULL? "NULL" : java_lang_Class::as_Klass(object)->external_name()));
+                                         object==NULL? "NULL" : object->klass()->external_name()));
 
       JvmtiVMObjectAllocEventMark jem(thread, h());
       JvmtiJavaThreadEventTransition jet(thread);