[Openutils-svn] SF.net SVN: openutils:[3336] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

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

Revision: 3336
          http://openutils.svn.sourceforge.net/openutils/?rev=3336&view=rev
Author:   fgiust
Date:     2011-02-09 20:39:12 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
null check on iterate()

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2011-02-09 20:15:27 UTC (rev 3335)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/utils/PlaylistIterateUtils.java	2011-02-09 20:39:12 UTC (rev 3336)
@@ -43,6 +43,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 
+import org.apache.commons.collections.IteratorUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -76,6 +77,11 @@
     @SuppressWarnings("unchecked")
     public static Iterator<MediaNodeAndEntryPath> iterate(final Content playlistNode)
     {
+        if (playlistNode == null)
+        {
+            return IteratorUtils.emptyIterator();
+        }
+
         try
         {
             if (playlistNode.hasContent("search"))
@@ -112,17 +118,19 @@
                         SortMode.SCORE,
                         (int) NodeDataUtil.getLong(playlistNode, "maxResults", 0),
                         1);
-                return Iterators.transform(searchResult.getItems(), new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
-                {
+                return Iterators.transform(
+                    searchResult.getItems(),
+                    new Function<AdvancedResultItem, MediaNodeAndEntryPath>()
+                    {
 
-                    /**
-                     * {@inheritDoc}
-                     */
-                    public MediaNodeAndEntryPath apply(AdvancedResultItem from)
-                    {
-                        return new MediaNodeAndEntryPath(from, null);
-                    }
-                });
+                        /**
+                         * {@inheritDoc}
+                         */
+                        public MediaNodeAndEntryPath apply(AdvancedResultItem from)
+                        {
+                            return new MediaNodeAndEntryPath(from, null);
+                        }
+                    });
             }
             else
             {


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