src/hotspot/share/prims/jvm.cpp

*** 2925,21 ***
    Handle h_obj(THREAD, JNIHandles::resolve(obj));
    return ObjectSynchronizer::current_thread_holds_lock(thread, h_obj);
  JVM_END
  
  JVM_ENTRY(jobject, JVM_GetStackTrace(JNIEnv *env, jobject jthread))
    oop trace = java_lang_Thread::async_get_stack_trace(jthread, THREAD);
    return JNIHandles::make_local(THREAD, trace);
  JVM_END
  
! JVM_ENTRY(jobject, JVM_CreateThreadSnapshot(JNIEnv* env, jobject jthread))
! #if INCLUDE_JVMTI
-   oop snapshot = ThreadSnapshotFactory::get_thread_snapshot(jthread, THREAD);
    return JNIHandles::make_local(THREAD, snapshot);
- #else
-   THROW_NULL(vmSymbols::java_lang_UnsupportedOperationException());
- #endif
  JVM_END
  
  JVM_ENTRY(void, JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring name))
    // We don't use a ThreadsListHandle here because the current thread
    // must be alive.
--- 2925,18 ---
    Handle h_obj(THREAD, JNIHandles::resolve(obj));
    return ObjectSynchronizer::current_thread_holds_lock(thread, h_obj);
  JVM_END
  
  JVM_ENTRY(jobject, JVM_GetStackTrace(JNIEnv *env, jobject jthread))
+   oop threadObj = JNIHandles::resolve(jthread);
    oop trace = java_lang_Thread::async_get_stack_trace(jthread, THREAD);
    return JNIHandles::make_local(THREAD, trace);
  JVM_END
  
! JVM_ENTRY(jobject, JVM_CreateThreadSnapshot(JNIEnv* env, jobject jthread, jboolean includeMonitors))
!   oop snapshot = ThreadSnapshotFactory::get_thread_snapshot(jthread, includeMonitors, THREAD);
    return JNIHandles::make_local(THREAD, snapshot);
  JVM_END
  
  JVM_ENTRY(void, JVM_SetNativeThreadName(JNIEnv* env, jobject jthread, jstring name))
    // We don't use a ThreadsListHandle here because the current thread
    // must be alive.