--- a/src/hotspot/share/runtime/objectMonitor.inline.hpp Tue Jan 29 10:09:13 2019 -0800
+++ b/src/hotspot/share/runtime/objectMonitor.inline.hpp Tue Jan 29 14:09:38 2019 -0500
@@ -58,18 +58,17 @@
}
inline void ObjectMonitor::clear() {
- assert(_header, "Fatal logic error in ObjectMonitor header!");
+ assert(_header != NULL, "Fatal logic error in ObjectMonitor header!");
assert(_count == 0, "Fatal logic error in ObjectMonitor count!");
assert(_waiters == 0, "Fatal logic error in ObjectMonitor waiters!");
assert(_recursions == 0, "Fatal logic error in ObjectMonitor recursions!");
assert(_object != NULL, "Fatal logic error in ObjectMonitor object!");
- assert(_owner == 0, "Fatal logic error in ObjectMonitor owner!");
+ assert(_owner == NULL, "Fatal logic error in ObjectMonitor owner!");
_header = NULL;
_object = NULL;
}
-
inline void* ObjectMonitor::object() const {
return _object;
}
@@ -95,7 +94,6 @@
return true;
}
-
// return number of threads contending for this monitor
inline jint ObjectMonitor::contentions() const {
return _count;
@@ -109,5 +107,4 @@
_recursions = 0;
}
-
#endif // SHARE_RUNTIME_OBJECTMONITOR_INLINE_HPP