svn commit: r493729 - /velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/NewsFeedGenerator.java

[henning]

Author: henning
Date: Sun Jan  7 06:37:26 2007
New Revision: 493729

URL: http://svn.apache.org/viewvc?view=rev&rev=493729
Log:
Avoid NPE with unset base.


Modified:
    
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/NewsFeedGenerator.java

Modified: 
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/NewsFeedGenerator.java
URL: 
http://svn.apache.org/viewvc/velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/NewsFeedGenerator.java?view=diff&rev=493729&r1=493728&r2=493729
==============================================================================
--- 
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/NewsFeedGenerator.java
 (original)
+++ 
velocity/site/tools/velocity-site-news/plugin/src/main/java/org/apache/velocity/site/news/plugin/NewsFeedGenerator.java
 Sun Jan  7 06:37:26 2007
@@ -74,7 +74,15 @@
         if (feed != null) {
             SyndEntry entry = new SyndEntryImpl();
             entry.setTitle(item.getHeadline());
-            entry.setLink(newsFeed.getBaseUrl() + newsFeed.getNewsFileName() + 
".html#" + item.getId());
+
+            String itemPath = newsFeed.getNewsFileName() + ".html#" + 
item.getId();
+
+            if (StringUtils.isNotEmpty(newsFeed.getBaseUrl())) {
+                entry.setLink(newsFeed.getBaseUrl() + itemPath);
+            } else {
+                // Strictly spoken this is not a legal RSS feed.
+                entry.setLink(itemPath);
+            }
 
             if (item.getDate() != null) {
                 
entry.setPublishedDate(VelocityNewsUtils.parseItemDate(item.getDate()));