Author: adamw Date: 2005-11-26 16:57:46 -0500 (Sat, 26 Nov 2005) New Revision: 1649 Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java Log: http://jira.jboss.com/jira/browse/JBSHOTOKU-28 Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java =================================================================== --- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java 2005-11-26 21:51:20 UTC (rev 1648) +++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/PollTools.java 2005-11-26 21:57:46 UTC (rev 1649) @@ -25,10 +25,7 @@ import java.io.File; import java.util.List; -import java.util.Map; -import javax.portlet.PortletURL; - import org.jboss.forge.common.ForgeHelper; import org.jboss.portal.common.context.Context; import org.jboss.portal.common.context.DelegateContext; Modified: trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java =================================================================== --- trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-11-26 21:51:20 UTC (rev 1648) +++ trunk/forge/portal-extensions/forge-service/src/java/org/jboss/forge/service/ForgeService.java 2005-11-26 21:57:46 UTC (rev 1649) @@ -74,19 +74,13 @@ * @see org.jboss.forge.common.service.ForgeManagement#addNodeWatcher(java.lang.String, java.lang.String, org.jboss.forge.common.service.NodeWatcher) */ public Object addNodeWatcher(String portalName, String key, NodeWatcher nw) { - Object initialValue = null; - try { - // Calculating the initial value & putting it into the cache. + // Calculating the initial value & putting it into the cache. + Object initialValue = nw.init(portalName); + putToCache(portalName, key, initialValue); - initialValue = nw.init(portalName); - putToCache(portalName, key, initialValue); + // Registering a new node watcher. + nodeWatchers.put(new CacheKey(portalName, key), nw); - // Registering a new node watcher. - nodeWatchers.put(new CacheKey(portalName, key), nw); - } catch (Throwable t) { - t.printStackTrace(); - } - return initialValue; } |