natObject.cc (_Jv_ObjectCheckMonitor): Initialize the sync_info element of the object...

	* java/lang/natObject.cc (_Jv_ObjectCheckMonitor): Initialize the
	sync_info element of the object if needed.

From-SVN: r92922

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6db73b18b3a4fabc1fa0f2103c40155fb9b3e361..90d2fe4bde92c4f09ba0b08145f6658d7b3a6835 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-05  Eric Botcazou  <ebotcazou@libertysurf.fr>
+
+       * java/lang/natObject.cc (_Jv_ObjectCheckMonitor): Initialize the
+       sync_info element of the object if needed.
+
 2005-01-03  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
        * testsuite/libjava.lang/Process_4.java (Process_4): Expect only

diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc
index 7dff626cd8510402709172faa190039c2e07cdbf..d7b67d7fa2d6eb12f009bbe8fd0b539487895718 100644 (file)
--- a/libjava/java/lang/natObject.cc
+++ b/libjava/java/lang/natObject.cc
@@ -267,6 +267,8 @@ _Jv_MonitorExit (jobject obj)
 bool
 _Jv_ObjectCheckMonitor (jobject obj)
 {
+  if (__builtin_expect (INIT_NEEDED (obj), false))
+    obj->sync_init ();
   _Jv_SyncInfo *si = (_Jv_SyncInfo *) obj->sync_info;
   return _Jv_MutexCheckMonitor (&si->mutex);
 }