[Ikvm-commit] ikvm/openjdk/java/util/concurrent/locks LockSupport.java, 1.6, 1.7

[Jeroen F. <jfr...@us...>]

Update of /cvsroot/ikvm/ikvm/openjdk/java/util/concurrent/locks
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13621

Modified Files:
	LockSupport.java 
Log Message:
Bug fix. LockSupport.parkUntil() didn't convert milliseconds to nanoseconds.

Index: LockSupport.java
===================================================================
RCS file: /cvsroot/ikvm/ikvm/openjdk/java/util/concurrent/locks/LockSupport.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** LockSupport.java	10 Nov 2014 09:18:25 -0000	1.6
--- LockSupport.java	12 Nov 2014 10:02:51 -0000	1.7
***************
*** 317,321 ****
          Thread t = Thread.currentThread();
          setBlocker(t, blocker);
!         parkImpl(t, true, deadline);
          setBlocker(t, null);
      }
--- 317,321 ----
          Thread t = Thread.currentThread();
          setBlocker(t, blocker);
!         parkImpl(t, true, deadline * 1000000);
          setBlocker(t, null);
      }
***************
*** 433,437 ****
       */
      public static void parkUntil(long deadline) {
!         parkImpl(Thread.currentThread(), true, deadline);
      }
  
--- 433,437 ----
       */
      public static void parkUntil(long deadline) {
!         parkImpl(Thread.currentThread(), true, deadline * 1000000);
      }