src/share/vm/prims/jvmtiManageCapabilities.cpp

rev 13139 : [mq]: heap7
rev 13140 : [mq]: heapz8

@@ -110,11 +110,10 @@
   jc.can_set_native_method_prefix = 1;
   jc.can_tag_objects = 1;
   jc.can_generate_object_free_events = 1;
   jc.can_generate_resource_exhaustion_heap_events = 1;
   jc.can_generate_resource_exhaustion_threads_events = 1;
-  jc.can_sample_heap = 1;
   return jc;
 }
 
 jvmtiCapabilities JvmtiManageCapabilities::init_onload_capabilities() {
   jvmtiCapabilities jc;

@@ -156,10 +155,11 @@
 
   memset(&jc, 0, sizeof(jc));
   jc.can_generate_field_modification_events = 1;
   jc.can_generate_field_access_events = 1;
   jc.can_generate_breakpoint_events = 1;
+  jc.can_sample_heap = 1;
   return jc;
 }
 
 
 jvmtiCapabilities *JvmtiManageCapabilities::either(const jvmtiCapabilities *a, const jvmtiCapabilities *b,

@@ -422,10 +422,12 @@
     log_trace(jvmti)("can_generate_exception_events");
   if (cap->can_generate_frame_pop_events)
     log_trace(jvmti)("can_generate_frame_pop_events");
   if (cap->can_generate_breakpoint_events)
     log_trace(jvmti)("can_generate_breakpoint_events");
+  if (cap->can_sample_heap)
+    log_trace(jvmti)("can_sample_heap");
   if (cap->can_suspend)
     log_trace(jvmti)("can_suspend");
   if (cap->can_redefine_any_class )
     log_trace(jvmti)("can_redefine_any_class");
   if (cap->can_retransform_any_class )