# HG changeset patch
# User robcast
# Date 1295462753 -3600
# Node ID c1306f6d6a79b8e728469a4e0c201d2e47cb0322
# Parent  8f40f7b6fd201c5dc18981e229e334a24aa5202c
fix in getParamRGBM/A to deal with empty input

diff -r 8f40f7b6fd20 -r c1306f6d6a79 servlet/src/digilib/image/ImageJobDescription.java
--- a/servlet/src/digilib/image/ImageJobDescription.java	Wed Jan 19 15:53:08 2011 +0100
+++ b/servlet/src/digilib/image/ImageJobDescription.java	Wed Jan 19 19:45:53 2011 +0100
@@ -429,7 +429,10 @@
 		float[] paramRGBM = null;//{0f,0f,0f};
 		Parameter p = params.get("rgbm");
 		if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
-			return p.parseAsFloatArray("/");
+			paramRGBM = p.parseAsFloatArray("/");
+			if ((paramRGBM == null) || (paramRGBM.length != 3)) {
+			    return null;
+			}
 		}	
 		return paramRGBM;
 	}
@@ -439,6 +442,9 @@
 		Parameter p = params.get("rgba");
 		if (p.hasValue() && (!p.getAsString().equals("0/0/0"))) {
 			paramRGBA = p.parseAsFloatArray("/");
+            if ((paramRGBA == null) || (paramRGBA.length != 3)) {
+                return null;
+            }
 		}
 		return paramRGBA;
 	}