Merge
authordsamersoff
Sat, 05 Dec 2015 03:10:50 +0000
changeset 34645 f00769790a1b
parent 34642 48ac5129fb61 (current diff)
parent 34644 2128c15fe868 (diff)
child 34646 e2442a5c90e4
Merge
--- a/hotspot/src/share/vm/runtime/vframe.cpp	Sat Dec 05 00:07:04 2015 +0000
+++ b/hotspot/src/share/vm/runtime/vframe.cpp	Sat Dec 05 03:10:50 2015 +0000
@@ -232,14 +232,12 @@
             // disable the extra printing below.
             mark = NULL;
           }
-        } else if (frame_count != 0 && ObjectMonitor::Knob_Verbose) {
+        } else if (frame_count != 0) {
           // This is not the first frame so we either own this monitor
           // or we owned the monitor before and called wait(). Because
           // wait() could have been called on any monitor in a lower
           // numbered frame on the stack, we have to check all the
           // monitors on the list for this frame.
-          // Note: Only enable this new output line in verbose mode
-          // since existing tests are not ready for it.
           mark = monitor->owner()->mark();
           if (mark->has_monitor() &&
               ( // we have marked ourself as pending on this monitor