Author: simoneg
Date: Fri Jan 29 04:30:47 2010
New Revision: 904378
URL: http://svn.apache.org/viewvc?rev=904378&view=rev
Log:
Make it more resistant to invalid data.
Modified:
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/conversion/image/ImageConverterToString.java
Modified:
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/conversion/image/ImageConverterToString.java
URL:
http://svn.apache.org/viewvc/labs/magma/trunk/beans-image/src/main/java/org/apache/magma/conversion/image/ImageConverterToString.java?rev=904378&r1=904377&r2=904378&view=diff
==============================================================================
---
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/conversion/image/ImageConverterToString.java
(original)
+++
labs/magma/trunk/beans-image/src/main/java/org/apache/magma/conversion/image/ImageConverterToString.java
Fri Jan 29 04:30:47 2010
@@ -2,12 +2,15 @@
import java.io.File;
+import javax.imageio.IIOException;
+
import org.apache.magma.basics.MagmaException;
import org.apache.magma.beans.MagImage;
import org.apache.magma.beans.MagFile;
import org.apache.magma.beans.PropertyInfo;
import org.apache.magma.beans.image.ImageFormat;
import org.apache.magma.beans.image.ImageUtil;
+import org.apache.magma.conversion.ConversionException;
import org.apache.magma.conversion.Converter;
import org.apache.magma.conversion.PropertyAwareConverter;
import org.apache.magma.conversion.string.BaseConverter;
@@ -61,13 +64,17 @@
MagUploadImageValidator validator =
(MagUploadImageValidator) val.getValidator(MagUploadImageValidator.class);
resizeFormat = validator.getResizeFormat();
} catch (NullPointerException e) {}
- if (resizeFormat != null) {
- ImageUtil iu = new ImageUtil(value);
- try {
- iu.resize(value, resizeFormat);
- } finally {
- iu.dispose();
+ try {
+ if (resizeFormat != null) {
+ ImageUtil iu = new ImageUtil(value);
+ try {
+ iu.resize(value, resizeFormat);
+ } finally {
+ iu.dispose();
+ }
}
+ } catch (IIOException e) {
+ throw new ConversionException(e, "Error reading
image : {0}", e.getMessage());
}
}
value.persist();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
