Author: simoneg
Date: Fri Jan 29 04:34:45 2010
New Revision: 904380
URL: http://svn.apache.org/viewvc?rev=904380&view=rev
Log:
Make it more resistant to invalid data.
Modified:
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/validation/validators/MagUploadImageValidator.java
Modified:
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/validation/validators/MagUploadImageValidator.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/beans-image/src/main/java/org/apache/magma/validation/validators/MagUploadImageValidator.java?rev=904380&r1=904379&r2=904380&view=diff
==============================================================================
---
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/validation/validators/MagUploadImageValidator.java
(original)
+++
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/validation/validators/MagUploadImageValidator.java
Fri Jan 29 04:34:45 2010
@@ -19,7 +19,11 @@
import java.util.ArrayList;
import java.util.List;
+import javax.imageio.IIOException;
+
import org.apache.magma.basics.LocalizableString;
+import org.apache.magma.basics.MagmaException;
+import org.apache.magma.basics.utils.ExceptionUtils;
import org.apache.magma.beans.MagImage;
import org.apache.magma.beans.PropertyInfo;
import org.apache.magma.beans.image.ImageFormat;
@@ -80,6 +84,13 @@
messages.add(new
LocalizableString("Image too small, it is {0}x{1}, while should be bigger than
{2}x{3}", iu.getWidth(), iu.getHeight(), minFormat.getWidth(),
minFormat.getHeight()));
}
}
+ } catch (MagmaException e) {
+ Throwable inner = ExceptionUtils.findInnerException(e);
+ if (inner instanceof IIOException) {
+ messages.add(new LocalizableString("File is not
a supported image format : {0}", inner.getMessage()));
+ } else {
+ throw e;
+ }
} finally {
if (iu != null) iu.dispose();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
