You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/07 17:36:39 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/cache TurbineGlobalCacheService.java

henning     2003/04/07 08:36:39

  Modified:    src/java/org/apache/turbine/services/cache
                        TurbineGlobalCacheService.java
  Log:
  Remove double default property checking
  
  Revision  Changes    Path
  1.9       +4 -6      jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java
  
  Index: TurbineGlobalCacheService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TurbineGlobalCacheService.java	4 Apr 2003 14:59:29 -0000	1.8
  +++ TurbineGlobalCacheService.java	7 Apr 2003 15:36:38 -0000	1.9
  @@ -64,7 +64,6 @@
   
   import org.apache.commons.configuration.Configuration;
   
  -import org.apache.turbine.Turbine;
   import org.apache.turbine.services.InitializationException;
   import org.apache.turbine.services.TurbineBaseService;
   
  @@ -126,9 +125,7 @@
        * Value must be > 0.
        * Default = 5 seconds
        */
  -    public static final long DEFAULT_CACHE_CHECK_FREQUENCY =
  -            Turbine.getConfiguration()
  -            .getLong("cache.check.frequency", 5000); // 5 seconds
  +    public static final long DEFAULT_CACHE_CHECK_FREQUENCY = 5000; // 5 seconds
   
       /** The cache. **/
       private Hashtable cache = null;
  @@ -185,6 +182,7 @@
               // to terminate in an orderly manner.
               housekeeping.setDaemon(true);
               housekeeping.start();
  +
               setInit(true);
           }
           catch (Exception e)
  @@ -196,7 +194,7 @@
   
       /**
        * Returns an item from the cache.  RefreshableCachedObject will be
  -     * refreshed if it is expired not untouched.
  +     * refreshed if it is expired and not untouched.
        *
        * @param id The key of the stored object.
        * @return The object from the cache.
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org