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

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

Revision: 2042
          http://openutils.svn.sourceforge.net/openutils/?rev=2042&view=rev
Author:   diego_schivo
Date:     2010-02-23 15:31:28 +0000 (Tue, 23 Feb 2010)

Log Message:
-----------
MEDIA-114 MediaEl throws NullPointerException when MediaTypeConfiguration is not found

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-23 10:10:32 UTC (rev 2041)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/tags/el/MediaEl.java	2010-02-23 15:31:28 UTC (rev 2042)
@@ -142,7 +142,7 @@
             MgnlContext.setLocale(locale);
         }
         MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
-        if (mtc == null)
+        if (mtc == null || mtc.getHandler() == null)
         {
             return null;
         }
@@ -177,11 +177,11 @@
             MgnlContext.setLocale(locale);
         }
         MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
-        if (mtc != null)
+        if (mtc == null || mtc.getHandler() == null)
         {
-            return mtc.getHandler().getTitle(media);
+            return null;
         }
-        return null;
+        return mtc.getHandler().getTitle(media);
     }
 
     /**
@@ -212,12 +212,17 @@
             MgnlContext.setLocale(locale);
         }
         MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
+        if (mtc == null || mtc.getHandler() == null)
+        {
+            return null;
+        }
         String tags = mtc.getHandler().getTags(media);
-        if (tags != null)
+        if (tags == null)
         {
-            return StringUtils.split(tags, ",");
+            return null;
+            
         }
-        return null;
+        return StringUtils.split(tags, ",");
     }
 
     /**
@@ -272,6 +277,10 @@
             return null;
         }
         MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
+        if (mtc == null || mtc.getHandler() == null)
+        {
+            return null;
+        }
         return mtc.getHandler().getThumbnailUrl(media);
     }
 
@@ -432,6 +441,10 @@
             return null;
         }
         MediaTypeConfiguration mtc = mcm.getMediaTypeConfigurationFromMedia(media);
+        if (mtc == null || mtc.getHandler() == null)
+        {
+            return null;
+        }
         return mtc.getHandler().getPreviewUrl(media);
     }
 


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