Change delay mechanism in WebcamDiscoveryService

sarxos · Feb 20, 2013 · 5111d85 · 5111d85
1 parent 0ce18b5
commit 5111d85
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDiscoveryService.java b/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDiscoveryService.java
@@ -142,9 +142,20 @@ public void run() {
 		// wait initial time interval since devices has been initially
 		// discovered
 
+		Object monitor = new Object();
+
 		do {
 
-			delay();
+			synchronized (monitor) {
+				try {
+					monitor.wait(support.getScanInterval());
+				} catch (InterruptedException e) {
+					if (LOG.isTraceEnabled()) {
+						LOG.error("Interrupted", e);
+					}
+					break;
+				}
+			}
 
 			WebcamDiscoveryListener[] listeners = Webcam.getDiscoveryListeners();
 
@@ -267,14 +278,6 @@ private static void notifyWebcamFound(Webcam webcam, WebcamDiscoveryListener[] l
 		}
 	}
 
-	private void delay() {
-		try {
-			Thread.sleep(support.getScanInterval());
-		} catch (InterruptedException e) {
-			throw new WebcamException(e);
-		}
-	}
-
 	/**
 	 * Stop discovery service.
 	 */