cvs commit: jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk AbstractDiskCache.java

[asmuts]

asmuts      02/05/14 13:36:03

  Modified:    src/java/org/apache/jcs/auxiliary/disk
                        AbstractDiskCache.java
  Log:
  first test fails, second works
  
  manual testing works
  
  Revision  Changes    Path
  1.8       +25 -5     
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/AbstractDiskCache.java
  
  Index: AbstractDiskCache.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/AbstractDiskCache.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AbstractDiskCache.java    14 May 2002 20:21:43 -0000      1.7
  +++ AbstractDiskCache.java    14 May 2002 20:36:03 -0000      1.8
  @@ -88,7 +88,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
  - * @version $Id: AbstractDiskCache.java,v 1.7 2002/05/14 20:21:43 asmuts Exp $
  + * @version $Id: AbstractDiskCache.java,v 1.8 2002/05/14 20:36:03 asmuts Exp $
    */
   public abstract class AbstractDiskCache implements AuxiliaryCache, Serializable
   {
  @@ -272,7 +272,7 @@
           }
           finally
           {
  -          locker.done( this.cacheName + key.toString() );
  +          releaseLock( this.cacheName + key.toString() );
           }
           // Remove from persistent store immediately
   
  @@ -362,7 +362,26 @@
   
               log.error( "Was interrupted while acquiring read lock", e );
           }
  -        catch ( Exception e )
  +        catch ( Throwable e )
  +        {
  +
  +            log.error(  e );
  +        }
  +    }
  +
  +
  +    /**
  +     * Internally used write lock for purgatory item modification.
  +     *
  +     * @param id What name to lock on.
  +     */
  +    private void releaseLock( String id )
  +    {
  +        try
  +        {
  +            locker.done( id );
  +        }
  +        catch ( Throwable e )
           {
   
               log.error(  e );
  @@ -419,7 +438,8 @@
                       // If the element has already been removed from purgatory
                       // do nothing
   
  -                    writeLock( getCacheName() + element.getKey().toString() );
  +                    String lK =element.getKey().toString();
  +                    writeLock( getCacheName() + lK );
                       try
                       {
   
  @@ -431,7 +451,7 @@
                       }
                       finally
                       {
  -                      locker.done( getCacheName() + element.getKey().toString() );
  +                      releaseLock( getCacheName() + lK );
                       }
   
                       element = pe.getCacheElement();
  
  
  

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