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

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

Revision: 1868
          http://openutils.svn.sourceforge.net/openutils/?rev=1868&view=rev
Author:   fgiust
Date:     2010-02-09 15:44:45 +0000 (Tue, 09 Feb 2010)

Log Message:
-----------
NPE check in getSize()

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-09 11:54:10 UTC (rev 1867)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-02-09 15:44:45 UTC (rev 1868)
@@ -378,21 +378,20 @@
             else
             {
                 Content resolutions = media.getChildByName("resolutions");
-                try
+                if (resolutions != null)
                 {
-                    if (resolutions.hasNodeData(ImageUtils.getResolutionPath("res-" + resolution)))
+                    try
                     {
-                        res = resolutions.getNodeData(ImageUtils.getResolutionPath("res-" + resolution));
+                        if (resolutions.hasNodeData(ImageUtils.getResolutionPath("res-" + resolution)))
+                        {
+                            res = resolutions.getNodeData(ImageUtils.getResolutionPath("res-" + resolution));
+                        }
                     }
-                    else
+                    catch (RepositoryException e)
                     {
                         res = null;
                     }
                 }
-                catch (RepositoryException e)
-                {
-                    res = null;
-                }
             }
 
             if (res != null)


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