[Openutils-svn] SF.net SVN: openutils:[1730] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

[<die...@us...>]

Revision: 1730
          http://openutils.svn.sourceforge.net/openutils/?rev=1730&view=rev
Author:   diego_schivo
Date:     2010-02-01 11:01:45 +0000 (Mon, 01 Feb 2010)

Log Message:
-----------
MEDIA-66 "broken image" displayed also for 0 byte files

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2010-02-01 10:39:24 UTC (rev 1729)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2010-02-01 11:01:45 UTC (rev 1730)
@@ -702,10 +702,8 @@
 
                     if (image.getContentLength() == 0)
                     {
-                        log.error(
-                            "Invalid image nodedata " + image.getHandle() + ", size " + image.getContentLength(),
-                            new Exception());
-                        return;
+                        throw new RuntimeException("Invalid image nodedata " + image.getHandle()
+                                + ", size " + image.getContentLength());
                     }
 
                     String extension = image.getAttribute(FileProperties.PROPERTY_EXTENSION);
@@ -728,7 +726,15 @@
 
                     Map<String, String> params = parseParameters(resolution);
 
-                    BufferedImage img = ImageUtils.getImageForResolution(original, resolution, params);
+                    BufferedImage img;
+                    try
+                    {
+                        img = ImageUtils.getImageForResolution(original, resolution, params);
+                    }
+                    catch (IllegalArgumentException e)
+                    {
+                        throw new RuntimeException(e);
+                    }
 
                     try
                     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.