[jboss-svn-commits] JBL Code SVN: r13367 - in labs/shotoku/trunk: shotoku-base/src/java/org/jboss/shotoku/cache and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: adamw
Date: 2007-07-11 13:13:19 -0400 (Wed, 11 Jul 2007)
New Revision: 13367

Modified:
   labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample
   labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuCacheItem.java
   labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java
Log:
Bug fix

Modified: labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample	2007-07-11 16:20:24 UTC (rev 13366)
+++ labs/shotoku/trunk/shotoku-base/src/etc/shotoku.properties.sample	2007-07-11 17:13:19 UTC (rev 13367)
@@ -59,7 +59,7 @@
 # Interval between feed updates, in milliseconds
 shotoku.internal.feeds.service.interval = 600000
 shotoku.internal.feeds.service.conn_timeout = 5000
-shotoku.internal.feeds.service.read_timeout = 1000
+shotoku.internal.feeds.service.read_timeout = 3000
 
 #
 # Tags configuration

Modified: labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuCacheItem.java
===================================================================
--- labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuCacheItem.java	2007-07-11 16:20:24 UTC (rev 13366)
+++ labs/shotoku/trunk/shotoku-base/src/java/org/jboss/shotoku/cache/ShotokuCacheItem.java	2007-07-11 17:13:19 UTC (rev 13367)
@@ -132,10 +132,10 @@
      */
     public final void update() {
         long now = Calendar.getInstance().getTimeInMillis();
-
+        
         if (now - lastUpdate >= interval) {
             for (final K key : keys) {
-                if (!keysDuringUpdate.add(key)) {
+                if (keysDuringUpdate.add(key)) {
                     service.acquireUpdateThread().setAndSignalData(new UpdateThreadData() {
                         public void execute() {
                             try {

Modified: labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java	2007-07-11 16:20:24 UTC (rev 13366)
+++ labs/shotoku/trunk/shotoku-feeds/src/java/org/jboss/shotoku/feeds/service/FeedsServiceImpl.java	2007-07-11 17:13:19 UTC (rev 13367)
@@ -90,7 +90,7 @@
         conf = new FeedsConfigurationWatcher();
 
         setTimerInterval(ContentManager.getProperty(FeedsConstants.PROPERTY_INTERVAL, 600000));
-        setRemoteReadTimeout(ContentManager.getProperty(FeedsConstants.PROPERTY_READ_TIMEOUT, 1000));
+        setRemoteReadTimeout(ContentManager.getProperty(FeedsConstants.PROPERTY_READ_TIMEOUT, 3000));
         setRemoteConnectionTimeout(ContentManager.getProperty(FeedsConstants.PROPERTY_CONN_TIMEOUT, 5000));
         
         fds = new HashMap<String, FeedsDescriptor>();