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

[<fg...@us...>]

Revision: 3259
          http://openutils.svn.sourceforge.net/openutils/?rev=3259&view=rev
Author:   fgiust
Date:     2011-01-23 17:59:32 +0000 (Sun, 23 Jan 2011)

Log Message:
-----------
MEDIA-206 Better logging: avoid stacktraces for invalid binaries

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	2011-01-23 17:56:15 UTC (rev 3258)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtils.java	2011-01-23 17:59:32 UTC (rev 3259)
@@ -803,6 +803,18 @@
 
             });
         }
+        catch (BadImageFormatException e)
+        {
+            if (e.getCause() != null)
+            {
+                log.warn(e.getMessage(), e.getCause());
+            }
+            else
+            {
+                log.warn("Unable to extract a valid image from " + media.getHandle() + " (no message)");
+            }
+            return false;
+        }
         catch (RuntimeException ex)
         {
             log.error(ClassUtils.getShortClassName(ex.getClass())
@@ -950,7 +962,15 @@
         InputStream is = image.getStream();
         try
         {
-            return ImageIO.read(is);
+            BufferedImage result = ImageIO.read(is);
+
+            // yes, ImageIO can return null without throwing any exception
+            if (result == null)
+            {
+                throw new BadImageFormatException("Unable to handle " + image.getHandle() + " (no message)");
+            }
+
+            return result;
         }
         catch (IOException e)
         {


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