# HG changeset patch
# User dholmes
# Date 1353551172 18000
# Node ID ca1be5fbe6ff78ad9bf5120480a2950791e05cc0
# Parent  73e64867adb7e12045178e7b14f85fc6bcf68d1f# Parent  6b881a6b06657515654992cd96e1e76a2119c0da
Merge

diff -r 6b881a6b0665 -r ca1be5fbe6ff src/share/vm/prims/jvmti.xml
--- a/src/share/vm/prims/jvmti.xml	Wed Nov 21 20:07:52 2012 -0500
+++ b/src/share/vm/prims/jvmti.xml	Wed Nov 21 21:26:12 2012 -0500
@@ -2370,11 +2370,11 @@
 jvmtiError err;
 
 err = (*jvmti)->GetStackTrace(jvmti, aThread, 0, 5, 
-                               &frames, &count);
+                               frames, &count);
 if (err == JVMTI_ERROR_NONE && count >= 1) {
    char *methodName;
    err = (*jvmti)->GetMethodName(jvmti, frames[0].method, 
-                       &methodName, NULL);
+                       &methodName, NULL, NULL);
    if (err == JVMTI_ERROR_NONE) {
       printf("Executing method: %s", methodName);
    }