diff --git a/core/src/main/java/hudson/util/OneShotEvent.java b/core/src/main/java/hudson/util/OneShotEvent.java index e41ab5094d..4c8a0b41c3 100644 --- a/core/src/main/java/hudson/util/OneShotEvent.java +++ b/core/src/main/java/hudson/util/OneShotEvent.java @@ -39,14 +39,25 @@ package hudson.util; */ public final class OneShotEvent { private boolean signaled; + private final Object lock; + + public OneShotEvent() { + this.lock = this; + } + + public OneShotEvent(Object lock) { + this.lock = lock; + } /** * Non-blocking method that signals this event. */ - public synchronized void signal() { - if(signaled) return; - this.signaled = true; - notifyAll(); + public void signal() { + synchronized (lock) { + if(signaled) return; + this.signaled = true; + lock.notifyAll(); + } } /** @@ -55,9 +66,11 @@ public final class OneShotEvent { *
* This method blocks infinitely until a value is offered. */ - public synchronized void block() throws InterruptedException { - while(!signaled) - wait(); + public void block() throws InterruptedException { + synchronized (lock) { + while(!signaled) + lock.wait(); + } } /** @@ -67,15 +80,19 @@ public final class OneShotEvent { * If the specified amount of time elapses, * this method returns null even if the value isn't offered. */ - public synchronized void block(long timeout) throws InterruptedException { - if(!signaled) - wait(timeout); + public void block(long timeout) throws InterruptedException { + synchronized (lock) { + if(!signaled) + lock.wait(timeout); + } } /** * Returns true if a value is offered. */ - public synchronized boolean isSignaled() { - return signaled; + public boolean isSignaled() { + synchronized (lock) { + return signaled; + } } }