Re: wait finishes early?

This looks to me like the correct logic, encapsulated reasonably well:

public class EventUtils
{
    public static void waitforEvent(
            long maxDelay, Object lock, EventChecker checker)
                throws InterruptedException
    {
        synchronized(lock)
        {
            long start = System.currentTimeMillis();
            long toWait = maxDelay;
            while (true)

            {
                lock.wait(toWait);
                if (checker.isDone())
                    break;
                if (maxDelay > 0)
                {
                    long elapsed = System.currentTimeMillis() - start;
                    if (elapsed >= maxDelay)
                        break;
                    toWait = maxDelay - elapsed;
                }
            }
        }
    }

    public interface EventChecker
    {
        boolean isDone();
    }
}