* posix-threads.cc (_Jv_CondWait): Fix currentTimeMillis() overflow.

[gcc.git] / libjava / posix-threads.cc

diff --git a/libjava/posix-threads.cc b/libjava/posix-threads.cc
index 436588aee320e358252ebe2086e3e1c88b448d2d..825b0206c1906f6ca51364a146c833965cf0c015 100644 (file)
--- a/libjava/posix-threads.cc
+++ b/libjava/posix-threads.cc
@@ -85,12 +85,11 @@ _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
     r = pthread_cond_wait (cv, pmu);
   else
     {
-      struct timespec ts;
-      unsigned long m = millis + java::lang::System::currentTimeMillis ();
-
-      ts.tv_sec = m / 1000;
-      ts.tv_nsec = (m % 1000) * 1000 * 1000 + nanos;
-
+      struct timespec ts; 
+      jlong m = millis + java::lang::System::currentTimeMillis (); 
+      ts.tv_sec = m / 1000; 
+      ts.tv_nsec = ((m % 1000) * 1000000) + nanos; 
+             
       r = pthread_cond_timedwait (cv, pmu, &ts);
     }
   return r;