jmcnally 2002/06/04 16:37:24
Modified: src/java/org/apache/jcs/engine/memory/lru
LRUMemoryCache.java
Log:
remove try/catch blocks and allow the exceptions to propagate.
Revision Changes Path
1.12 +44 -71
jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/lru/LRUMemoryCache.java
Index: LRUMemoryCache.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/engine/memory/lru/LRUMemoryCache.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LRUMemoryCache.java 23 May 2002 15:55:28 -0000 1.11
+++ LRUMemoryCache.java 4 Jun 2002 23:37:24 -0000 1.12
@@ -33,7 +33,7 @@
*@author <a href="mailto:[EMAIL PROTECTED]";>Aaron Smuts</a>
*@author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
*@created May 13, 2002
- *@version $Id: LRUMemoryCache.java,v 1.11 2002/05/23 15:55:28 jtaylor Exp $
+ *@version $Id: LRUMemoryCache.java,v 1.12 2002/06/04 23:37:24 jmcnally Exp $
*/
public class LRUMemoryCache implements MemoryCache, Serializable
{
@@ -194,32 +194,21 @@
public ICacheElement getQuiet( Serializable key )
throws IOException
{
- MemoryElementDescriptor me = null;
ICacheElement ce = null;
- try
+ MemoryElementDescriptor me = (MemoryElementDescriptor) map.get(key);
+ if ( me != null )
{
-
- me = ( MemoryElementDescriptor ) map.get( key );
- if ( me != null )
- {
- if ( log.isDebugEnabled() )
- {
- log.debug( cacheName + ": LRUMemoryCache quiet hit for " + key
);
- }
-
- ce = me.ce;
-
- }
- else
+ if ( log.isDebugEnabled() )
{
- log.debug( cacheName + ": LRUMemoryCache quiet miss for " + key );
+ log.debug(cacheName + ": LRUMemoryCache quiet hit for " + key);
}
-
+
+ ce = me.ce;
}
- catch ( Exception e )
+ else if ( log.isDebugEnabled() )
{
- log.error( e );
+ log.debug( cacheName + ": LRUMemoryCache quiet miss for " + key );
}
return ce;
@@ -235,40 +224,32 @@
public ICacheElement get( Serializable key )
throws IOException
{
- MemoryElementDescriptor me = null;
ICacheElement ce = null;
- try
+ if ( log.isDebugEnabled() )
{
- if ( log.isDebugEnabled() )
- {
- log.debug( "getting item for key: " + key );
- }
-
- me = ( MemoryElementDescriptor ) map.get( key );
-
- if ( me != null )
- {
- if ( log.isDebugEnabled() )
- {
- log.debug( cacheName + ": LRUMemoryCache hit for " + key );
- }
-
- ce = me.ce;
+ log.debug( "getting item for key: " + key );
+ }
+
+ MemoryElementDescriptor me = (MemoryElementDescriptor) map.get(key);
- ce.getElementAttributes().setLastAccessTimeNow();
- makeFirst( me );
- }
- else
+ if ( me != null )
+ {
+ if ( log.isDebugEnabled() )
{
- log.debug( cacheName + ": LRUMemoryCache miss for " + key );
+ log.debug( cacheName + ": LRUMemoryCache hit for " + key );
}
+
+ ce = me.ce;
+
+ ce.getElementAttributes().setLastAccessTimeNow();
+ makeFirst( me );
}
- catch ( Exception e )
+ else
{
- log.error( e );
+ log.debug( cacheName + ": LRUMemoryCache miss for " + key );
}
-
+
return ce;
}
@@ -609,36 +590,28 @@
*/
public synchronized void makeFirst( MemoryElementDescriptor me )
{
- try
+ if ( me.prev == null )
{
- if ( me.prev == null )
- {
- // already the first node.
- return;
- }
- me.prev.next = me.next;
-
- if ( me.next == null )
- {
- // last but not the first.
- last = me.prev;
- last.next = null;
- }
- else
- {
- // neither the last nor the first.
- me.next.prev = me.prev;
- }
- first.prev = me;
- me.next = first;
- me.prev = null;
- first = me;
+ // already the first node.
+ return;
+ }
+ me.prev.next = me.next;
+
+ if ( me.next == null )
+ {
+ // last but not the first.
+ last = me.prev;
+ last.next = null;
}
- catch ( Exception e )
+ else
{
- log.error( "Couldn't make first", e );
+ // neither the last nor the first.
+ me.next.prev = me.prev;
}
- return;
+ first.prev = me;
+ me.next = first;
+ me.prev = null;
+ first = me;
}
// ---------------------------------------------------------- debug methods
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
