Index: drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Thread.java =================================================================== --- drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Thread.java (revision 428035) +++ drlvm/trunk/vm/vmcore/src/kernel_classes/javasrc/java/lang/Thread.java (working copy) @@ -543,6 +543,9 @@ */ public final void join(long millis, int nanos) throws InterruptedException { + if (millis < 0 || nanos < 0 || nanos > 999999) + throw new IllegalArgumentException(); + if (millis == 0 && nanos == 0) { join(); return;