Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorsspitsyn
Fri, 14 Jun 2013 22:34:08 -0700
changeset 18082 4643c90969f2
parent 18080 fc13007c0363 (current diff)
parent 18081 c0a9e6c4058c (diff)
child 18083 6424d03bb556
Merge
--- a/hotspot/src/share/vm/prims/jvmti.xml	Fri Jun 14 19:49:58 2013 -0700
+++ b/hotspot/src/share/vm/prims/jvmti.xml	Fri Jun 14 22:34:08 2013 -0700
@@ -1897,7 +1897,7 @@
 	  </description>
 	</param>
 	<param id="monitor_info_ptr">
-	  <allocbuf outcount="owned_monitor_depth_count_ptr">
+	  <allocbuf outcount="monitor_info_count_ptr">
             <struct>jvmtiMonitorStackDepthInfo</struct>
           </allocbuf>
 	  <description>
jdk-sandbox