Re: [xwiki-devs] [xwiki-notifications] r9849 - xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/plugin/feed

Author: ludovic Date: 2008-05-18 14:09:38 +0200 (Sun, 18 May 2008) New Revision: 9849 Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/FeedPlugin.java xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/FeedPluginApi.java xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/UpdateThread.java Log: XWATCH-142 Watch cannot load more than one Watch space of the same name in a XEM installation Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/ xwiki/plugin/feed/FeedPlugin.java =================================================================== --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/FeedPlugin.java 2008-05-18 12:09:18 UTC (rev 9848) +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/FeedPlugin.java 2008-05-18 12:09:38 UTC (rev 9849) @@ -319,10 +319,10 @@ public boolean startUpdateFeedsInSpace(String space, boolean fullContent, int scheduleTimer, XWikiContext context) throws XWikiException { - UpdateThread updateThread = (UpdateThread) updateThreads.get(space); + UpdateThread updateThread = (UpdateThread) updateThreads.get(context.getDatabase() + ":" + space); if (updateThread==null) { updateThread = new UpdateThread(space, fullContent, scheduleTimer, this, context); - updateThreads.put(space, updateThread); + updateThreads.put(context.getDatabase() + ":" + space, updateThread); Thread thread = new Thread(updateThread); thread.start(); return true; @@ -332,22 +332,22 @@ } public void stopUpdateFeedsInSpace(String space, XWikiContext context) throws XWikiException { - UpdateThread updateThread = (UpdateThread) updateThreads.get(space); + UpdateThread updateThread = (UpdateThread) updateThreads.get(context.getDatabase() + ":" + space); if (updateThread!=null) { updateThread.stopUpdate(); } } - public void removeUpdateThread(String space, UpdateThread thread) { + public void removeUpdateThread(String space, UpdateThread thread, XWikiContext context) { // make sure the update thread is removed. // this is called by the update thread when the loop is last exited - if (thread==updateThreads.get(space)) { - updateThreads.remove(space); + if (thread==updateThreads.get(context.getDatabase() + ":" + space)) { + updateThreads.remove(context.getDatabase() + ":" + space); } } - public UpdateThread getUpdateThread(String space) { - return (UpdateThread) updateThreads.get(space); + public UpdateThread getUpdateThread(String space, XWikiContext context) { + return (UpdateThread) updateThreads.get(context.getDatabase() + ":" + space); } public Collection getActiveUpdateThreads() { Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/ xwiki/plugin/feed/FeedPluginApi.java =================================================================== --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/FeedPluginApi.java 2008-05-18 12:09:18 UTC (rev 9848) +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/FeedPluginApi.java 2008-05-18 12:09:38 UTC (rev 9849) @@ -161,7 +161,7 @@ public UpdateThread getUpdateThread(String space) { - return plugin.getUpdateThread(space); + return plugin.getUpdateThread(space, context); } public Collection getActiveUpdateThreads() { Modified: xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/ xwiki/plugin/feed/UpdateThread.java =================================================================== --- xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/UpdateThread.java 2008-05-18 12:09:18 UTC (rev 9848) +++ xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/ plugin/feed/UpdateThread.java 2008-05-18 12:09:38 UTC (rev 9849) @@ -55,7 +55,7 @@ while (true) { update(); if (stopUpdate) { - feedPlugin.removeUpdateThread(space, this); + feedPlugin.removeUpdateThread(space, this, context); break; } try { @@ -126,7 +126,7 @@ public void stopUpdate() { if (!updateInProgress) { - feedPlugin.removeUpdateThread(space, this); + feedPlugin.removeUpdateThread(space, this, context); } stopUpdate = true; } _______________________________________________ notifications mailing list notifications(a)xwiki.org http://lists.xwiki.org/mailman/listinfo/notifications