cvs commit: avalon-excalibur/store/src/java/org/apache/excalibur/store/impl MRUMemoryStore.java

[cziegeler]

cziegeler    2003/07/17 00:48:08

  Modified:    store/src/java/org/apache/excalibur/store/impl
                        MRUMemoryStore.java
  Log:
  Look up persistent store only if it is really needed
  
  Revision  Changes    Path
  1.13      +17 -3     
avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/MRUMemoryStore.java
  
  Index: MRUMemoryStore.java
  ===================================================================
  RCS file: 
/home/cvs/avalon-excalibur/store/src/java/org/apache/excalibur/store/impl/MRUMemoryStore.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- MRUMemoryStore.java       20 May 2003 21:03:39 -0000      1.12
  +++ MRUMemoryStore.java       17 Jul 2003 07:48:08 -0000      1.13
  @@ -107,10 +107,8 @@
           m_manager = manager;
           if( getLogger().isDebugEnabled() )
           {
  -            getLogger().debug( "Looking up " + Store.PERSISTENT_STORE );
               getLogger().debug( "Looking up " + StoreJanitor.ROLE );
           }
  -        m_persistentStore = (Store)manager.lookup( Store.PERSISTENT_STORE );
           m_storeJanitor = (StoreJanitor)manager.lookup( StoreJanitor.ROLE );
       }
   
  @@ -133,6 +131,22 @@
           if( ( m_maxobjects < 1 ) )
           {
               throw new ParameterException( "MRUMemoryStore maxobjects must be at 
least 1!" );
  +        }
  +
  +        if ( m_persistent )
  +        {
  +            if( getLogger().isDebugEnabled() )
  +            {
  +                getLogger().debug( "Looking up " + Store.PERSISTENT_STORE );
  +            }
  +            try 
  +            {
  +                m_persistentStore = (Store)m_manager.lookup( Store.PERSISTENT_STORE 
);
  +            }
  +            catch (ServiceException se)
  +            {
  +                throw new ParameterException("Unable to look up persistent store.", 
se);
  +            }
           }
   
           m_cache = new Hashtable( (int)( m_maxobjects * 1.2 ) );
  
  
  

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