[Openutils-svn] SF.net SVN: openutils:[1982] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java

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

Revision: 1982
          http://openutils.svn.sourceforge.net/openutils/?rev=1982&view=rev
Author:   fgiust
Date:     2010-02-18 11:28:21 +0000 (Thu, 18 Feb 2010)

Log Message:
-----------
MEDIA-110 null check

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-02-18 10:43:42 UTC (rev 1981)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-02-18 11:28:21 UTC (rev 1982)
@@ -331,6 +331,11 @@
     public static String urlres(Content media, String resolution)
     {
 
+        if (media == null)
+        {
+            return null;
+        }
+        
         // MEDIA-90 may be simply a url
         if (media.getNodeData(BaseTypeHandler.ORGINAL_NODEDATA_NAME).getType() == PropertyType.BINARY)
         {
@@ -344,7 +349,7 @@
             }
         }
 
-        if (media == null || !ImageUtils.checkOrCreateResolution(media, resolution, null))
+        if (!ImageUtils.checkOrCreateResolution(media, resolution, null))
         {
             return null;
         }


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