asmuts      2004/06/29 19:43:51

  Modified:    src/java/org/apache/jcs/engine/memory/shrinking
                        ShrinkerThread.java
               src/java/org/apache/jcs/engine/memory
                        AbstractMemoryCache.java
  Log:
  1. Removed system.gc from shrinker thread.
  
  2. Call shrinker.kill() in AbstractMemoryCache.dispose
  Estefano Eduardo's suggestion
  
  Revision  Changes    Path
  1.14      +2 -2      
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/shrinking/ShrinkerThread.java
  
  Index: ShrinkerThread.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/shrinking/ShrinkerThread.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- ShrinkerThread.java       12 Jun 2004 02:32:54 -0000      1.13
  +++ ShrinkerThread.java       30 Jun 2004 02:43:51 -0000      1.14
  @@ -257,7 +257,7 @@
               }
   
               keys = null;
  -            System.gc();
  +            //System.gc();
           }
           catch ( Throwable t )
           {
  
  
  
  1.8       +6 -2      
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/AbstractMemoryCache.java
  
  Index: AbstractMemoryCache.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/AbstractMemoryCache.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractMemoryCache.java  12 Jun 2004 02:34:13 -0000      1.7
  +++ AbstractMemoryCache.java  30 Jun 2004 02:43:51 -0000      1.8
  @@ -43,7 +43,7 @@
    *
    [EMAIL PROTECTED]    $Id$
    */
  -public abstract class AbstractMemoryCache 
  +public abstract class AbstractMemoryCache
       implements MemoryCache, Serializable
   {
       private final static Log log =
  @@ -108,6 +108,7 @@
           if ( cattr.getUseMemoryShrinker() && shrinker == null )
           {
               shrinker = new ShrinkerThread( this );
  +            shrinker.setDaemon(true);
               shrinker.setPriority( ShrinkerThread.MIN_PRIORITY );
               shrinker.start();
           }
  @@ -181,6 +182,9 @@
       public void dispose()
           throws IOException
       {
  +      if ( shrinker != null ) {
  +        shrinker.kill();
  +      }
       }
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to