[Jboss-svn-commits] JBL Code SVN: r992 - trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog

[<jbo...@li...>]

Author: adamw
Date: 2005-08-27 05:55:01 -0400 (Sat, 27 Aug 2005)
New Revision: 992

Modified:
   trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
Log:
Blog fix


Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java	2005-08-27 08:59:49 UTC (rev 991)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java	2005-08-27 09:55:01 UTC (rev 992)
@@ -93,7 +93,10 @@
                 .getServerName());
         feedAddress = replaceProperty(feedAddress, "${host.port}", Integer
                 .toString(request.getServerPort()));
-        feedAddress = replaceProperty(feedAddress, "${project.name}", projectId);
+        if (projectId != null)
+        		feedAddress = replaceProperty(feedAddress, "${project.name}", projectId);
+        else
+        		feedAddress = replaceProperty(feedAddress, "${project.name}", "default");
         feedAddress = replaceProperty(feedAddress, "${portal.name}", portalName);
         feedAddress = replaceProperty(feedAddress, "${feed.type}", "atom");
         
@@ -135,13 +138,11 @@
         int fromEntry = Integer.parseInt(fromEntryString);
         
         String cacheKey = AbstractBlog.class.getName()+"/"+projectId;
-        System.out.println("BLOG ID: " + projectId);
         
         SyndFeed feed = (SyndFeed) forgeHelper.getForgeManagement().getFromCache(
         		portalName, cacheKey);
         
         if (feed == null) {
-        	System.out.println("TO CACHE: " + cacheKey);
         	feed = (SyndFeed) forgeHelper.getForgeManagement().
         		addNodeWatcher(portalName, cacheKey,
         				new BlogNodeWatcher(feedAddress));
@@ -312,27 +313,4 @@
 
         return found;
     }
-
-    /**
-     * Item of the cache
-     */
-    class CacheItem {
-        private long time;
-
-        private SyndFeed feed;
-
-        CacheItem(long time, SyndFeed feed) {
-            this.time = time;
-            this.feed = feed;
-        }
-
-        long getTime() {
-            return time;
-        }
-
-        SyndFeed getFeed() {
-            return feed;
-        }
-
-    }
 }
\ No newline at end of file