You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jcs-dev@jakarta.apache.org by as...@apache.org on 2006/02/03 23:55:13 UTC
svn commit: r374774 - in /jakarta/jcs/trunk/src/java/org/apache/jcs:
auxiliary/disk/indexed/ auxiliary/remote/ config/ engine/ engine/behavior/
engine/control/event/ engine/control/group/
Author: asmuts
Date: Fri Feb 3 14:55:03 2006
New Revision: 374774
URL: http://svn.apache.org/viewcvs?rev=374774&view=rev
Log:
cleaning up style problems
adding checks to prevent the possibility of null pointers in the disk cache reset
Modified:
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWait.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheWatchRepairable.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteUtils.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java
jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheWatch.java
jakarta/jcs/trunk/src/java/org/apache/jcs/config/OptionConverter.java
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEvent.java
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java
jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupId.java
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCache.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCache.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCache.java Fri Feb 3 14:55:03 2006
@@ -32,9 +32,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
-import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
-
import org.apache.jcs.auxiliary.disk.AbstractDiskCache;
import org.apache.jcs.auxiliary.disk.LRUMapJCS;
import org.apache.jcs.engine.CacheConstants;
@@ -48,6 +45,8 @@
import org.apache.jcs.engine.stats.behavior.IStats;
import org.apache.jcs.utils.struct.SortedPreferentialArray;
+import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
+
/**
* Disk cache that uses a RandomAccessFile with keys stored in memory.
*
@@ -517,8 +516,8 @@
for ( Iterator itr = keyHash.keySet().iterator(); itr.hasNext(); )
{
- //Map.Entry entry = (Map.Entry) itr.next();
- //Object k = entry.getKey();
+ // Map.Entry entry = (Map.Entry) itr.next();
+ // Object k = entry.getKey();
Object k = itr.next();
if ( k instanceof GroupAttrName && ( (GroupAttrName) k ).groupId.equals( groupId ) )
{
@@ -658,7 +657,7 @@
}
catch ( Exception e )
{
- log.error( e );
+ log.error( "Problem removing element.", e );
reset = true;
}
finally
@@ -690,7 +689,7 @@
}
finally
{
- //swallow
+ // swallow
}
}
@@ -712,13 +711,19 @@
{
storageLock.writeLock().acquire();
- dataFile.close();
- File file = new File( rafDir, fileName + ".data" );
- file.delete();
+ if ( dataFile != null )
+ {
+ dataFile.close();
+ }
+ File dataFileTemp = new File( rafDir, fileName + ".data" );
+ dataFileTemp.delete();
- keyFile.close();
- File file2 = new File( rafDir, fileName + ".key" );
- file2.delete();
+ if ( keyFile != null )
+ {
+ keyFile.close();
+ }
+ File keyFileTemp = new File( rafDir, fileName + ".key" );
+ keyFileTemp.delete();
dataFile = new IndexedDisk( new File( rafDir, fileName + ".data" ) );
@@ -766,7 +771,7 @@
/**
* Create the map for keys that contain the index position on disk.
- *
+ *
*/
private void initKeyMap()
{
@@ -873,7 +878,7 @@
}
- /////////////////////////////////////////////////////////////////////////////////
+ // ///////////////////////////////////////////////////////////////////////////////
// OPTIMIZATION METHODS
/**
@@ -913,7 +918,7 @@
* put. 4. Write the element for the key copy to disk in the normal
* proceedure. 5. All gets will be serviced by the new file. 6. All puts are
* made on the new file.
- *
+ *
*/
private void optimizeRealTime()
{
@@ -941,13 +946,13 @@
LRUMap keyHashTemp = new LRUMap( this.maxKeySize );
keyHashTemp.tag = "Round=" + timesOptimized;
IndexedDisk dataFileTemp = new IndexedDisk( new File( rafDir, fileName + "Temp.data" ) );
- //dataFileTemp.reset();
+ // dataFileTemp.reset();
// make sure flag is set to true
isOptomizing = true;
int len = keys.length;
- //while ( itr.hasNext() )
+ // while ( itr.hasNext() )
if ( log.isInfoEnabled() )
{
log.info( "Optimizing RT -- TempKeys, length = " + len );
@@ -955,17 +960,17 @@
for ( int i = 0; i < len; i++ )
{
// lock so no more gets to the queue -- optimizingPutList
- //storageLock.writeLock();
+ // storageLock.writeLock();
storageLock.writeLock().acquire();
try
{
- //Serializable key = ( Serializable ) itr.next();
+ // Serializable key = ( Serializable ) itr.next();
Serializable key = (Serializable) keys[i];
this.moveKeyDataToTemp( key, keyHashTemp, dataFileTemp );
}
finally
{
- //storageLock.done();
+ // storageLock.done();
storageLock.writeLock().release();
}
}
@@ -1034,14 +1039,14 @@
LRUMap keyHashTemp = new LRUMap( this.maxKeySize );
IndexedDisk dataFileTemp = new IndexedDisk( new File( rafDir, fileName + "Temp.data" ) );
- //dataFileTemp.reset();
+ // dataFileTemp.reset();
if ( log.isInfoEnabled() )
{
log.info( "Optomizing file keyHash.size()=" + keyHash.size() );
}
- //Iterator itr = keyHash.keySet().iterator();
+ // Iterator itr = keyHash.keySet().iterator();
Object[] keys = keyHash.keySet().toArray();
int len = keys.length;
@@ -1049,10 +1054,10 @@
try
{
- //while ( itr.hasNext() )
+ // while ( itr.hasNext() )
for ( int i = 0; i < len; i++ )
{
- //Serializable key = ( Serializable ) itr.next();
+ // Serializable key = ( Serializable ) itr.next();
Serializable key = (Serializable) keys[i];
this.moveKeyDataToTemp( key, keyHashTemp, dataFileTemp );
}
@@ -1096,14 +1101,14 @@
catch ( IOException e )
{
log.error( "Failed to get orinigal off disk cache: " + fileName + ", key: " + key + "" );
- //reset();
+ // reset();
throw e;
}
try
{
- //IndexedDiskElementDescriptor de =
- // dataFileTemp.appendObject( tempDe );
+ // IndexedDiskElementDescriptor de =
+ // dataFileTemp.appendObject( tempDe );
IndexedDiskElementDescriptor ded = new IndexedDiskElementDescriptor();
byte[] data = IndexedDisk.serialize( tempDe );
@@ -1194,7 +1199,7 @@
}
- ///////////////////////////////////////////////////////////////////////////////
+ // /////////////////////////////////////////////////////////////////////////////
// DEBUG
/**
* Returns the current cache size.
@@ -1318,7 +1323,7 @@
return stats;
}
- ///////////////////////////////////////////////////////////////////////////////
+ // /////////////////////////////////////////////////////////////////////////////
// RECYLCE INNER CLASS
/**
* class for recylcing and lru
@@ -1328,13 +1333,14 @@
{
private static final long serialVersionUID = 4955079991472142198L;
+
/**
* <code>tag</code> tells us which map we are working on.
*/
public String tag = "orig";
/**
- *
+ *
*/
public LRUMap()
{
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWait.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWait.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWait.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWait.java Fri Feb 3 14:55:03 2006
@@ -47,6 +47,8 @@
public class RemoteCacheNoWait
implements AuxiliaryCache
{
+ private static final long serialVersionUID = -3104089136003714717L;
+
private final static Log log = LogFactory.getLog( RemoteCacheNoWait.class );
private final RemoteCache cache;
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java Fri Feb 3 14:55:03 2006
@@ -45,6 +45,8 @@
public class RemoteCacheNoWaitFacade
implements AuxiliaryCache
{
+ private static final long serialVersionUID = -4529970797620747110L;
+
private final static Log log = LogFactory.getLog( RemoteCacheNoWaitFacade.class );
/** The connection to a remote server, or a zombie. */
@@ -52,7 +54,7 @@
private String cacheName;
- // holds failover and cluster information
+ /** holds failover and cluster information */
protected RemoteCacheAttributes rca;
private ICompositeCacheManager cacheMgr;
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheWatchRepairable.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheWatchRepairable.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheWatchRepairable.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheWatchRepairable.java Fri Feb 3 14:55:03 2006
@@ -28,4 +28,5 @@
extends CacheWatchRepairable
implements IRemoteCacheObserver
{
+ // nothing
}
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteUtils.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteUtils.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/RemoteUtils.java Fri Feb 3 14:55:03 2006
@@ -39,9 +39,10 @@
{
private final static Log log = LogFactory.getLog( RemoteUtils.class );
- /** Constructor for the RemoteUtils object */
+ /** No instances please. */
private RemoteUtils()
{
+ super();
}
/**
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheService.java Fri Feb 3 14:55:03 2006
@@ -41,6 +41,8 @@
*/
public void update( ICacheElement item, long listenerId )
{
+ // Zombies have no inner life
+ return;
}
/*
@@ -49,6 +51,8 @@
*/
public void remove( String cacheName, Serializable key, long listenerId )
{
+ // Zombies have no inner life
+ return;
}
/*
@@ -57,6 +61,8 @@
*/
public void removeAll( String cacheName, long listenerId )
{
+ // Zombies have no inner life
+ return;
}
public Set getGroupKeys( String cacheName, String groupName )
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheWatch.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheWatch.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheWatch.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/auxiliary/remote/ZombieRemoteCacheWatch.java Fri Feb 3 14:55:03 2006
@@ -28,4 +28,5 @@
extends ZombieCacheWatch
implements IRemoteCacheObserver
{
+ // nothing
}
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/config/OptionConverter.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/config/OptionConverter.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/config/OptionConverter.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/config/OptionConverter.java Fri Feb 3 14:55:03 2006
@@ -43,9 +43,10 @@
static StringBuffer sbuf = new StringBuffer();
- /** OptionConverter is a static class. */
+ /** No instances please. */
private OptionConverter()
{
+ super();
}
/**
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/ZombieCacheWatch.java Fri Feb 3 14:55:03 2006
@@ -39,6 +39,7 @@
*/
public void addCacheListener( String cacheName, ICacheListener obj )
{
+ return;
}
/**
@@ -50,6 +51,7 @@
*/
public void addCacheListener( ICacheListener obj )
{
+ return;
}
/*
@@ -58,6 +60,7 @@
*/
public void removeCacheListener( String cacheName, ICacheListener obj )
{
+ return;
}
/*
@@ -66,5 +69,6 @@
*/
public void removeCacheListener( ICacheListener obj )
{
+ return;
}
}
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/behavior/IZombie.java Fri Feb 3 14:55:03 2006
@@ -22,4 +22,6 @@
*/
public interface IZombie
{
+ // Zombies have no inner life.
+ // No qaulia found.
}
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEvent.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEvent.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEvent.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/event/ElementEvent.java Fri Feb 3 14:55:03 2006
@@ -18,18 +18,20 @@
import java.util.EventObject;
-import org.apache.jcs.engine.control.event.behavior.IElementEventConstants;
import org.apache.jcs.engine.control.event.behavior.IElementEvent;
+import org.apache.jcs.engine.control.event.behavior.IElementEventConstants;
/**
* Element events will trigger the creation of Element Event objects. This is a
* wrapper around the cache element that indicates the event triggered.
- *
+ *
*/
public class ElementEvent
extends EventObject
implements IElementEventConstants, IElementEvent
{
+
+ private static final long serialVersionUID = -5364117411457467056L;
private int elementEvent = ElementEvent.ELEMENT_EVENT_EXCEEDED_MAXLIFE_BACKGROUND;
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java Fri Feb 3 14:55:03 2006
@@ -25,10 +25,12 @@
public class GroupAttrName
implements Serializable
{
- //final GroupId groupId;
+ private static final long serialVersionUID = 1586079686300744198L;
+
/** Description of the Field */
public final GroupId groupId;
+ /** the name of the attribute */
public final Object attrName;
private String toString;
Modified: jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupId.java
URL: http://svn.apache.org/viewcvs/jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupId.java?rev=374774&r1=374773&r2=374774&view=diff
==============================================================================
--- jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupId.java (original)
+++ jakarta/jcs/trunk/src/java/org/apache/jcs/engine/control/group/GroupId.java Fri Feb 3 14:55:03 2006
@@ -26,9 +26,14 @@
public class GroupId
implements Serializable
{
+ private static final long serialVersionUID = 4626368486444860133L;
+
/** Description of the Field */
public final String groupName;
+ /**
+ * the name of the region.
+ */
public final String cacheName;
private String toString;
---------------------------------------------------------------------
To unsubscribe, e-mail: jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jcs-dev-help@jakarta.apache.org