jtaylor 02/04/12 06:03:12
Modified: src/java/org/apache/jcs/access CacheAccess.java
src/java/org/apache/jcs/engine/control Cache.java
CacheHub.java CompositeCacheConfigurator.java
src/java/org/apache/jcs/engine/control/group GroupCache.java
GroupCacheHub.java
src/test/org/apache/jcs/access TestCacheAccess.java
Log:
- Cleaning up Cache.get
- Using 'AuxilliaryCache' instead of 'ICache' in some placs where it is
more appropriate
Revision Changes Path
1.4 +1 -12
jakarta-turbine-jcs/src/java/org/apache/jcs/access/CacheAccess.java
Index: CacheAccess.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/access/CacheAccess.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CacheAccess.java 10 Apr 2002 15:00:59 -0000 1.3
+++ CacheAccess.java 12 Apr 2002 13:03:12 -0000 1.4
@@ -82,7 +82,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
* @created February 13, 2002
- * @version $Id: CacheAccess.java,v 1.3 2002/04/10 15:00:59 jtaylor Exp $
+ * @version $Id: CacheAccess.java,v 1.4 2002/04/12 13:03:12 jtaylor Exp $
*/
public class CacheAccess implements ICacheAccess
{
@@ -457,17 +457,6 @@
{
cacheControl.dispose();
}
-
- /**
- * Return statistics for the region.
- *
- * @return HTML formatted string containing region statistics
- */
- protected String getStats()
- {
- return cacheControl.getStats();
- }
-
/**
* Gets the ICompositeCacheAttributes of the cache region
1.6 +81 -116
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/Cache.java
Index: Cache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/Cache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Cache.java 10 Apr 2002 15:01:02 -0000 1.5
+++ Cache.java 12 Apr 2002 13:03:12 -0000 1.6
@@ -62,18 +62,18 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jcs.access.exception.CacheException;
-import org.apache.jcs.access.exception.ObjectExistsException;
import org.apache.jcs.access.exception.ObjectNotFoundException;
-import org.apache.jcs.engine.CacheElement;
+import org.apache.jcs.auxiliary.AuxiliaryCache;
import org.apache.jcs.engine.CacheConstants;
+import org.apache.jcs.engine.CacheElement;
import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICacheElement;
import org.apache.jcs.engine.behavior.ICacheType;
import org.apache.jcs.engine.behavior.ICompositeCache;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
import org.apache.jcs.engine.behavior.IElementAttributes;
-import org.apache.jcs.engine.memory.MemoryElementDescriptor;
import org.apache.jcs.engine.memory.MemoryCache;
+import org.apache.jcs.engine.memory.MemoryElementDescriptor;
import org.apache.jcs.engine.memory.lru.LRUMemoryCache;
/**
@@ -83,7 +83,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
- * @version $Id: Cache.java,v 1.5 2002/04/10 15:01:02 jtaylor Exp $
+ * @version $Id: Cache.java,v 1.6 2002/04/12 13:03:12 jtaylor Exp $
*/
public class Cache
implements ICache, ICompositeCache, Serializable
@@ -91,7 +91,7 @@
private final static Log log = LogFactory.getLog( Cache.class );
// Auxiliary caches.
- private ICache[] auxCaches;
+ private AuxiliaryCache[] auxCaches;
// track hit counts for each
private int[] auxHit;
@@ -110,8 +110,11 @@
*/
public ICompositeCacheAttributes cacheAttr;
- // statistics
+ // Statistics
+ // FIXME: Provide accessors for these for instrumentation
+
private static int numInstances;
+
private int ramHit;
private int miss;
@@ -131,7 +134,7 @@
* @param attr The default element attributes
*/
public Cache( String cacheName,
- ICache[] auxCaches,
+ AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
@@ -140,6 +143,7 @@
this.cacheName = cacheName;
this.auxCaches = auxCaches;
+
if ( auxCaches != null )
{
this.auxHit = new int[ auxCaches.length ];
@@ -374,7 +378,7 @@
}
catch ( IOException ex )
{
- handleException( ex );
+ log.error( "Failure in updateExclude", ex );
}
}
// SEND LATERALLY
@@ -487,37 +491,32 @@
*
* @return
* @param key
- * @param container
* @param invocation
*/
public ICacheElement get( Serializable key, boolean invocation )
{
+ ICacheElement element = null;
+
if ( log.isDebugEnabled() )
{
- log.debug( "in cache get(key,container)" );
+ log.debug( "get: key = " + key + ", local = "
+ + ( invocation == CacheConstants.LOCAL_INVOKATION ) );
}
- ICacheElement ce = null;
- boolean found = false;
-
try
{
+ // First look in memory cache
- if ( log.isDebugEnabled() )
- {
- log.debug( "get: key = " + key + ", is local invocation = "
- + ( invocation == CacheConstants.LOCAL_INVOKATION ) );
- }
-
- ce = memCache.get( key );
+ element = memCache.get( key );
- if ( ce == null )
+ if ( element == null )
{
- // Item not found in memory. Try the auxiliary caches if local.
+ // Item not found in memory. If local invocation look in aux
+ // caches, even if not local look in disk auxiliaries
for ( int i = 0; i < auxCaches.length; i++ )
{
- ICache aux = auxCaches[ i ];
+ AuxiliaryCache aux = auxCaches[ i ];
if ( aux != null )
{
@@ -527,54 +526,50 @@
{
if ( log.isDebugEnabled() )
{
- log.debug( "get(key,container,invocation) > in
local block, aux.getCacheType() = " + aux.getCacheType() );
+ log.debug( "Attempting to get from aux: "
+ + aux.getCacheName()
+ + " which is of type: "
+ + aux.getCacheType() );
}
try
{
- ce = ( ICacheElement ) aux.get( key );
+ element = aux.get( key );
}
catch ( IOException ex )
{
- handleException( ex );
+ log.error( "Error getting from aux", ex );
}
}
if ( log.isDebugEnabled() )
{
- log.debug( "ce = " + ce );
+ log.debug( "Got CacheElement: " + element );
}
- if ( ce != null )
+ if ( element != null )
{
- found = true;
+ log.debug(
+ cacheName + " - Aux cache[" + i + "] hit" );
+
// Item found in one of the auxiliary caches.
auxHit[ i ]++;
- if ( log.isDebugEnabled() )
- {
- log.debug( cacheName + " -- AUX[" + i + "]-HIT for
" + key );
- log.debug( "ce.getKey() = " + ce.getKey() );
- log.debug( "ce.getVal() = " + ce.getVal() );
- }
-
- memCache.update( ce );
+ // Spool the item back into memory
+ memCache.update( element );
break;
}
}
- // end for
}
- // end if invocation = LOCAL
-
}
else
{
- found = true;
ramHit++;
+
if ( log.isDebugEnabled() )
{
- log.debug( cacheName + " -- RAM-HIT for " + key );
+ log.debug( cacheName + " - Memory cache hit" );
}
}
@@ -584,59 +579,66 @@
log.error( e );
}
- try
+ if ( element == null )
{
- if ( !found )
+ miss++;
+
+ if ( log.isDebugEnabled() )
{
- // Item not found in all caches.
- miss++;
- if ( log.isDebugEnabled() )
- {
- log.debug( cacheName + " -- MISS for " + key );
- }
- return null;
+ log.debug( cacheName + " - Miss" );
}
- }
- catch ( Exception e )
- {
- log.error( "Error handling miss", e );
+
return null;
}
- // HUB Manages expiration
+ // If an element was found, we still need to deal with expiration.
+
try
{
+ IElementAttributes attributes = element.getElementAttributes();
- if ( !ce.getElementAttributes().getIsEternal() )
+ if ( ! attributes.getIsEternal() )
{
-
long now = System.currentTimeMillis();
- // Exceeded maxLifeSeconds
- if ( ( ce.getElementAttributes().getMaxLifeSeconds() != -1 ) && (
now - ce.getElementAttributes().getCreateTime() ) > (
ce.getElementAttributes().getMaxLifeSeconds() * 1000 ) )
+ // Remove if maxLifeSeconds exceeded
+
+ long maxLifeSeconds = attributes.getMaxLifeSeconds();
+ long createTime = attributes.getCreateTime();
+
+ if ( maxLifeSeconds != -1
+ && ( now - createTime ) > ( maxLifeSeconds * 1000 ) )
{
if ( log.isInfoEnabled() )
{
- log.info( "Exceeded maxLifeSeconds -- " + ce.getKey() );
+ log.info( "Exceeded maxLife: " + element.getKey() );
}
- this.remove( key );
- //cache.remove( me.ce.getKey() );
+
+ remove( key );
+
return null;
}
else
- // NOT SURE IF THIS REALLY BELONGS HERE. WHAT IS THE
- // POINT OF IDLE TIME? SEEMS OK
- // Exceeded maxIdleTime, removal
- if ( ( ce.getElementAttributes().getIdleTime() != -1 ) && ( now
- ce.getElementAttributes().getLastAccessTime() ) > (
ce.getElementAttributes().getIdleTime() * 1000 ) )
+ {
+ long idleTime = attributes.getIdleTime();
+ long lastAccessTime = attributes.getLastAccessTime();
+
+ // Remove if maxIdleTime exceeded
+ // FIXME: Does this really belong here?
+
+ if ( ( idleTime != -1 )
+ && ( now - lastAccessTime ) > ( idleTime * 1000 ) )
{
- if ( log.isInfoEnabled() )
+ if ( log.isDebugEnabled() )
{
- log.info( "Exceeded maxIdleTime [
ce.getElementAttributes().getIdleTime() = " + ce.getElementAttributes().getIdleTime()
+ " ]-- " + ce.getKey() );
+ log.info( "Exceeded maxIdle: " + element.getKey() );
}
- this.remove( key );
- //cache.remove( me.ce.getKey() );
+
+ remove( key );
+
return null;
}
+ }
}
}
@@ -646,12 +648,8 @@
return null;
}
-
- return ce;
+ return element;
}
- // end get
-
-
/**
* Removes an item from the cache.
@@ -684,7 +682,7 @@
* @param key
* @param nonLocal
*/
- // can't be protected because groupcache method needs to be called from access
+
public synchronized boolean remove( Serializable key, boolean nonLocal )
{
@@ -733,7 +731,7 @@
}
catch ( IOException ex )
{
- handleException( ex );
+ log.error( "Failure removing from aux", ex );
}
}
return removed;
@@ -768,7 +766,7 @@
}
catch ( IOException ex )
{
- handleException( ex );
+ log.error( "Failure removing all from aux", ex );
}
}
}
@@ -829,7 +827,7 @@
while ( itr.hasNext() )
{
Map.Entry entry = ( Map.Entry ) itr.next();
- Serializable key = ( Serializable ) entry.getKey();
+
MemoryElementDescriptor me = (
MemoryElementDescriptor ) entry.getValue();
try
{
@@ -853,7 +851,7 @@
}
catch ( IOException ex )
{
- handleException( ex );
+ log.error( "Failure disposing of aux", ex );
}
}
}
@@ -895,7 +893,7 @@
while ( itr.hasNext() )
{
Map.Entry entry = ( Map.Entry ) itr.next();
- Serializable key = ( Serializable ) entry.getKey();
+
MemoryElementDescriptor me = ( MemoryElementDescriptor
) entry.getValue();
aux.update( me.ce );
@@ -904,7 +902,7 @@
}
catch ( IOException ex )
{
- handleException( ex );
+ log.error( "Failure saving aux caches", ex );
}
}
}
@@ -915,28 +913,6 @@
}
/**
- * Gets the stats attribute of the Cache object
- *
- * FIXME: Remove HTML!
- *
- * @return The stats value
- */
- public String getStats()
- {
- StringBuffer stats = new StringBuffer();
- stats.append( "cacheName = " + cacheName + ", numInstances = " +
numInstances );
- stats.append( "<br> ramSize = " + memCache.getSize() + "/ ramHit = " +
ramHit );
-
- for ( int i = 0; i < auxHit.length; i++ )
- {
- stats.append( "/n<br> auxHit[" + i + "] = " + auxHit[ i ] + ", " +
this.auxCaches[ i ].getClass().getName() + "" );
- }
- stats.append( "/n<br> miss = " + miss );
- stats.append( "/n<br> cacheAttr = " + cacheAttr.toString() );
- return stats.toString();
- }
-
- /**
* Gets the size attribute of the Cache object
*
* @return The size value
@@ -967,16 +943,6 @@
}
/**
- * Description of the Method
- *
- * @param ex
- */
- private void handleException( IOException ex )
- {
- ex.printStackTrace();
- }
-
- /**
* Gets the cacheName attribute of the Cache object
*
* @return The cacheName value
@@ -1043,7 +1009,6 @@
* might want to create a memory cache config file separate from that of the
* hub -- ICompositeCacheAttributes
*
- * @return
* @param cattr
*/
private void createMemoryCache( ICompositeCacheAttributes cattr )
1.7 +3 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CacheHub.java
Index: CacheHub.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CacheHub.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- CacheHub.java 12 Apr 2002 02:13:33 -0000 1.6
+++ CacheHub.java 12 Apr 2002 13:03:12 -0000 1.7
@@ -13,6 +13,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jcs.auxiliary.AuxiliaryCacheAttributes;
import org.apache.jcs.auxiliary.AuxiliaryCacheFactory;
+import org.apache.jcs.auxiliary.AuxiliaryCache;
import org.apache.jcs.auxiliary.remote.behavior.IRemoteCacheConstants;
import org.apache.jcs.engine.CompositeCacheAttributes;
import org.apache.jcs.engine.ElementAttributes;
@@ -251,7 +252,7 @@
/** Creates internal system cache */
protected Cache createSystemCache( String cacheName,
- ICache[] auxCaches,
+ AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
@@ -263,7 +264,7 @@
* override this method to create the specific cache.
*/
protected Cache createCache( String cacheName,
- ICache[] auxCaches,
+ AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
1.4 +25 -33
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java
Index: CompositeCacheConfigurator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/CompositeCacheConfigurator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompositeCacheConfigurator.java 10 Apr 2002 15:01:02 -0000 1.3
+++ CompositeCacheConfigurator.java 12 Apr 2002 13:03:12 -0000 1.4
@@ -1,28 +1,23 @@
package org.apache.jcs.engine.control;
import java.io.FileInputStream;
-import java.io.InputStream;
import java.io.IOException;
-
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.Properties;
import java.util.StringTokenizer;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.auxiliary.AuxiliaryCache;
import org.apache.jcs.auxiliary.AuxiliaryCacheAttributes;
import org.apache.jcs.auxiliary.AuxiliaryCacheFactory;
-
import org.apache.jcs.config.OptionConverter;
import org.apache.jcs.config.PropertySetter;
-
-import org.apache.jcs.engine.ElementAttributes;
-import org.apache.jcs.engine.behavior.IElementAttributes;
import org.apache.jcs.engine.behavior.ICache;
import org.apache.jcs.engine.behavior.ICompositeCacheAttributes;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.jcs.engine.behavior.IElementAttributes;
/**
* This class is based on the log4j class org.apache.log4j.PropertyConfigurator
@@ -70,7 +65,7 @@
catch ( IOException e )
{
log.error( "Could not read configuration file, ignored: " +
- configFileName, e );
+ configFileName, e );
return;
}
@@ -140,7 +135,7 @@
{
String key = ( String ) enum.nextElement();
if ( key.startsWith( SYSTEM_REGION_PREFIX )
- && ( key.indexOf( "attributes" ) == -1 ) )
+ && ( key.indexOf( "attributes" ) == -1 ) )
{
String regionName = key.substring( SYSTEM_REGION_PREFIX.length() );
String value = OptionConverter.findAndSubst( key, props );
@@ -194,7 +189,6 @@
return parseRegion( props, regName, value, cca, REGION_PREFIX );
}
-
/** */
protected ICache parseRegion( Properties props,
String regName,
@@ -221,7 +215,7 @@
}
}
- ICache auxCache;
+ AuxiliaryCache auxCache;
String auxName;
while ( st.hasMoreTokens() )
{
@@ -239,7 +233,8 @@
}
}
- ICache[] auxCaches = ( ICache[] ) auxList.toArray( new ICache[0] );
+ AuxiliaryCache[] auxCaches =
+ ( AuxiliaryCache[] ) auxList.toArray( new AuxiliaryCache[ 0 ] );
// GET COMPOSITECACHEATTRIBUTES
if ( cca == null )
@@ -249,7 +244,6 @@
IElementAttributes ea = parseElementAttributes( props, regName,
regionPrefix );
-
ICache cache = null;
if ( regionPrefix.equals( SYSTEM_REGION_PREFIX ) )
{
@@ -271,7 +265,6 @@
return parseCompositeCacheAttributes( props, regName, REGION_PREFIX );
}
-
/** */
protected ICompositeCacheAttributes
parseCompositeCacheAttributes( Properties props,
@@ -285,12 +278,12 @@
// auxFactory was not previously initialized.
//String prefix = regionPrefix + regName + ATTRIBUTE_PREFIX;
ccAttr = ( ICompositeCacheAttributes ) OptionConverter.instantiateByKey(
props, attrName,
- org.apache.jcs.engine.behavior.ICompositeCacheAttributes.class,
- null );
+
org.apache.jcs.engine.behavior.ICompositeCacheAttributes.class,
+
null );
if ( ccAttr == null )
{
log.warn( "Could not instantiate ccAttr named '" + attrName +
- "', using defaults." );
+ "', using defaults." );
ICompositeCacheAttributes ccAttr2 = ccMgr.getDefaultCacheAttributes();
ccAttr = ccAttr2.copy();
@@ -311,8 +304,8 @@
/** */
protected IElementAttributes
parseElementAttributes( Properties props,
- String regName,
- String regionPrefix )
+ String regName,
+ String regionPrefix )
{
IElementAttributes eAttr;
@@ -321,12 +314,12 @@
// auxFactory was not previously initialized.
//String prefix = regionPrefix + regName + ATTRIBUTE_PREFIX;
eAttr = ( IElementAttributes ) OptionConverter.instantiateByKey( props,
attrName,
- org.apache.jcs.engine.behavior.IElementAttributes.class,
- null );
+
org.apache.jcs.engine.behavior.IElementAttributes.class,
+ null );
if ( eAttr == null )
{
log.warn( "Could not instantiate eAttr named '" + attrName +
- "', using defaults." );
+ "', using defaults." );
IElementAttributes eAttr2 = ccMgr.getDefaultElementAttributes();
eAttr = eAttr2.copy();
@@ -344,13 +337,12 @@
return eAttr;
}
-
/** Get an aux cache for the listed aux for a region. */
- protected ICache parseAuxiliary( Properties props,
- String auxName,
- String regName )
+ protected AuxiliaryCache parseAuxiliary( Properties props,
+ String auxName,
+ String regName )
{
- ICache auxCache;
+ AuxiliaryCache auxCache;
// GET FACTORY
AuxiliaryCacheFactory auxFac = ccMgr.registryFacGet( auxName );
@@ -359,8 +351,8 @@
// auxFactory was not previously initialized.
String prefix = AUXILIARY_PREFIX + auxName;
auxFac = ( AuxiliaryCacheFactory ) OptionConverter.instantiateByKey(
props, prefix,
- org.apache.jcs.auxiliary.AuxiliaryCacheFactory.class,
- null );
+
org.apache.jcs.auxiliary.AuxiliaryCacheFactory.class,
+
null );
if ( auxFac == null )
{
log.error( "Could not instantiate auxFactory named \"" + auxName +
"\"." );
@@ -378,8 +370,8 @@
// auxFactory was not previously initialized.
String prefix = AUXILIARY_PREFIX + auxName + ATTRIBUTE_PREFIX;
auxAttr = ( AuxiliaryCacheAttributes )
OptionConverter.instantiateByKey( props, prefix,
- org.apache.jcs.auxiliary.AuxiliaryCacheAttributes.class,
- null );
+
org.apache.jcs.auxiliary.AuxiliaryCacheAttributes.class,
+
null );
if ( auxFac == null )
{
log.error( "Could not instantiate auxAttr named '" + attrName + "'"
);
1.6 +3 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCache.java
Index: GroupCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCache.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GroupCache.java 12 Apr 2002 01:39:57 -0000 1.5
+++ GroupCache.java 12 Apr 2002 13:03:12 -0000 1.6
@@ -71,6 +71,7 @@
import org.apache.jcs.engine.behavior.IElementAttributes;
import org.apache.jcs.engine.control.Cache;
import org.apache.jcs.utils.locking.ReadWriteLockManager;
+import org.apache.jcs.auxiliary.AuxiliaryCache;
/**
* Group cache is basically a composite cache with the additional capability of
@@ -108,7 +109,7 @@
* @param attr The default element attributes
*/
public GroupCache( String cacheName,
- ICache[] auxCaches,
+ AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
@@ -131,7 +132,7 @@
* @param systemGroupIdCache The systemGroupIdCache
*/
public GroupCache( String cacheName,
- ICache[] auxCaches,
+ AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr,
ICompositeCache systemGroupIdCache )
1.3 +3 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCacheHub.java
Index: GroupCacheHub.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/control/group/GroupCacheHub.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- GroupCacheHub.java 12 Apr 2002 01:39:57 -0000 1.2
+++ GroupCacheHub.java 12 Apr 2002 13:03:12 -0000 1.3
@@ -10,6 +10,7 @@
import org.apache.jcs.engine.behavior.IElementAttributes;
import org.apache.jcs.engine.control.Cache;
import org.apache.jcs.engine.control.CacheHub;
+import org.apache.jcs.auxiliary.AuxiliaryCache;
/** */
public class GroupCacheHub
@@ -28,7 +29,7 @@
* @see CacheHub#createSystemCache
*/
protected Cache createSystemCache( String cacheName,
- ICache[] auxCaches,
+ AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
@@ -43,7 +44,7 @@
* @see CacheHub#createCache
*/
protected Cache createCache( String cacheName,
- ICache[] auxCaches,
+ AuxiliaryCache[] auxCaches,
ICompositeCacheAttributes cattr,
IElementAttributes attr )
{
1.3 +1 -8
jakarta-turbine-jcs/src/test/org/apache/jcs/access/TestCacheAccess.java
Index: TestCacheAccess.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/test/org/apache/jcs/access/TestCacheAccess.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestCacheAccess.java 8 Apr 2002 18:27:49 -0000 1.2
+++ TestCacheAccess.java 12 Apr 2002 13:03:12 -0000 1.3
@@ -412,14 +412,7 @@
p( "---got " + key + " in " + String.valueOf( n_end -
n_start ) + " millis ---" );
}
}
- else
- if ( message.startsWith( "stats" ) )
- {
- // print stats
- p( cache_control.getStats() );
- }
- else
- if ( message.startsWith( "putg" ) )
+ else if ( message.startsWith( "putg" ) )
{
String group = null;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
