Return null instead of throwing exception, refs #267

sarxos · Oct 19, 2014 · 1081ed6 · 1081ed6
1 parent 2c908ca
commit 1081ed6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...ure-drivers/driver-ipcam/src/main/java/com/github/sarxos/webcam/ds/ipcam/IpCamDevice.java b/...ure-drivers/driver-ipcam/src/main/java/com/github/sarxos/webcam/ds/ipcam/IpCamDevice.java
@@ -306,11 +306,11 @@ public void setResolution(Dimension size) {
 	public synchronized BufferedImage getImage() {
 
 		if (!open) {
-			throw new WebcamException("IpCam device not open");
+			return null;
 		}
 
 		if (mode == null) {
-			throw new IllegalArgumentException("Camera mode cannot be null!");
+			throw new IllegalStateException("Camera mode cannot be null!");
 		}
 
 		switch (mode) {

diff --git a/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDriver.java b/webcam-capture/src/main/java/com/github/sarxos/webcam/WebcamDriver.java
@@ -4,7 +4,8 @@
 
 
 /**
- * This is interface for all webcam drivers.
+ * Webcam drivers abstraction. The webcam driver (or capture driver, as it is
+ * often referred) is a factory for specific webcam device implementations.
  * 
  * @author Bartosz Firyn (SarXos)
  */