--- a/hotspot/src/share/vm/runtime/vframe.cpp Mon May 17 00:47:28 2010 -0700
+++ b/hotspot/src/share/vm/runtime/vframe.cpp Tue May 18 11:02:18 2010 -0700
@@ -101,8 +101,8 @@
bool found_first_monitor = false;
ObjectMonitor *pending_monitor = thread()->current_pending_monitor();
ObjectMonitor *waiting_monitor = thread()->current_waiting_monitor();
- oop pending_obj = (pending_monitor != NULL ? (oop) pending_monitor->object() : NULL);
- oop waiting_obj = (waiting_monitor != NULL ? (oop) waiting_monitor->object() : NULL);
+ oop pending_obj = (pending_monitor != NULL ? (oop) pending_monitor->object() : (oop) NULL);
+ oop waiting_obj = (waiting_monitor != NULL ? (oop) waiting_monitor->object() : (oop) NULL);
for (int index = (mons->length()-1); index >= 0; index--) {
MonitorInfo* monitor = mons->at(index);