asmuts 2004/06/11 19:33:05
Modified: src/java/org/apache/jcs/utils/locking RwLockGC.java
src/java/org/apache/jcs/auxiliary/remote/server
RemoteCacheServerListener.java
RemoteCacheServerInfo.java
RemoteCacheServerFactory.java
RemoteCacheServerAttributes.java
RemoteCacheServer.java
src/java/org/apache/jcs/auxiliary/remote
RemoteCacheNoWaitFacade.java
Log:
Antonio Gallardo's formatting and import cleanup patch.
I may have missed a few things in the patch. Also, I could not update to the new
version of util concurrent in the project.xml, since maven couldn't find the 1.3.4
specified in the patch.
Revision Changes Path
1.5 +1 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/utils/locking/RwLockGC.java
Index: RwLockGC.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/utils/locking/RwLockGC.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RwLockGC.java 15 Apr 2004 19:22:51 -0000 1.4
+++ RwLockGC.java 12 Jun 2004 02:33:05 -0000 1.5
@@ -98,7 +98,7 @@
try
{
//p("RwLockGC sleeping for " + IDLE_PERIOD);
- Thread.currentThread().sleep( IDLE_PERIOD );
+ sleep( IDLE_PERIOD );
}
catch ( InterruptedException ex )
{
1.11 +2 -2
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java
Index: RemoteCacheServerListener.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerListener.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- RemoteCacheServerListener.java 25 May 2004 05:27:42 -0000 1.10
+++ RemoteCacheServerListener.java 12 Jun 2004 02:33:05 -0000 1.11
@@ -226,7 +226,7 @@
getCacheManager();
// interface limitation here
- CompositeCache cache = ( CompositeCache ) cacheMgr.getCache( cacheName );
+ CompositeCache cache = cacheMgr.getCache( cacheName );
cache.localRemove( key );
}
@@ -253,7 +253,7 @@
{
log.debug( "handleDispose> cacheName=" + cacheName );
}
- CompositeCacheManager cm = ( CompositeCacheManager ) cacheMgr;
+ CompositeCacheManager cm = cacheMgr;
cm.freeCache( cacheName, true );
}
1.5 +1 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java
Index: RemoteCacheServerInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerInfo.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RemoteCacheServerInfo.java 25 May 2004 05:27:42 -0000 1.4
+++ RemoteCacheServerInfo.java 12 Jun 2004 02:33:05 -0000 1.5
@@ -40,6 +40,6 @@
*/
protected static VMID vmid = new VMID();
/** Description of the Field */
- public static long listenerId = ( long ) vmid.hashCode();
+ public static long listenerId = vmid.hashCode();
}
1.7 +1 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java
Index: RemoteCacheServerFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RemoteCacheServerFactory.java 15 Apr 2004 19:22:51 -0000 1.6
+++ RemoteCacheServerFactory.java 12 Jun 2004 02:33:05 -0000 1.7
@@ -176,7 +176,7 @@
// TODO: safer exit ?
try
{
- Thread.currentThread().sleep( 2000 );
+ Thread.sleep( 2000 );
}
catch ( InterruptedException ex )
{
1.5 +1 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java
Index: RemoteCacheServerAttributes.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServerAttributes.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- RemoteCacheServerAttributes.java 15 Apr 2004 19:22:51 -0000 1.4
+++ RemoteCacheServerAttributes.java 12 Jun 2004 02:33:05 -0000 1.5
@@ -175,7 +175,7 @@
catch ( Exception e )
{
}
- return ( AuxiliaryCacheAttributes ) this;
+ return this;
}
1.17 +12 -18
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java
Index: RemoteCacheServer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheServer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RemoteCacheServer.java 25 May 2004 05:36:20 -0000 1.16
+++ RemoteCacheServer.java 12 Jun 2004 02:33:05 -0000 1.17
@@ -229,7 +229,7 @@
public void update( ICacheElement item )
throws IOException
{
- update( item, ( long ) 0 );
+ update( item, 0 );
}
@@ -261,7 +261,7 @@
try
{
CacheListeners cacheDesc = getCacheListeners( item.getCacheName() );
- Object val = item.getVal();
+ /*Object val = */item.getVal();
Integer remoteTypeL = ( Integer ) idTypeMap.get( new Long( requesterId
) );
boolean fromCluster = false;
@@ -341,7 +341,7 @@
if ( timing )
{
long end = System.currentTimeMillis();
- this.p1( "put took " + String.valueOf( end - start ) + " ms." );
+ p1( "put took " + String.valueOf( end - start ) + " ms." );
}
return;
@@ -406,7 +406,7 @@
}
// Integer remoteTypeL = ( Integer ) idTypeMap.get( new Long( requesterId )
);
- boolean fromCluster = false;
+// boolean fromCluster = false;
// if ( remoteTypeL.intValue() == IRemoteCacheAttributes.CLUSTER )
// {
// fromCluster = true;
@@ -426,12 +426,9 @@
{
return null;
}
- else
- {
- CompositeCache c = ( CompositeCache ) cacheDesc.cache;
+ CompositeCache c = ( CompositeCache ) cacheDesc.cache;
- return c.localGet( key );
- }
+ return c.localGet( key );
}
/**
@@ -453,18 +450,15 @@
{
return Collections.EMPTY_SET;
}
- else
- {
- CompositeCache c = ( CompositeCache ) cacheDesc.cache;
- return c.getGroupKeys(group);
- }
+ CompositeCache c = ( CompositeCache ) cacheDesc.cache;
+ return c.getGroupKeys(group);
}
/** Removes the given key from the specified remote cache. */
public void remove( String cacheName, Serializable key )
throws IOException
{
- remove( cacheName, key, ( long ) 0 );
+ remove( cacheName, key, 0 );
}
@@ -541,7 +535,7 @@
public void removeAll( String cacheName )
throws IOException
{
- removeAll( cacheName, ( long ) 0 );
+ removeAll( cacheName, 0 );
}
@@ -573,7 +567,7 @@
public void dispose( String cacheName )
throws IOException
{
- dispose( cacheName, ( long ) 0 );
+ dispose( cacheName, 0 );
}
@@ -610,7 +604,7 @@
for ( Enumeration en = cacheListenersMap.elements();
en.hasMoreElements(); )
{
CacheListeners cacheDesc = ( CacheListeners ) en.nextElement();
- ICacheEventQueue[] qlist = getEventQList( cacheDesc, ( long ) 0 );
+ ICacheEventQueue[] qlist = getEventQList( cacheDesc, 0 );
for ( int i = 0; i < qlist.length; i++ )
{
1.8 +1 -1
jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java
Index: RemoteCacheNoWaitFacade.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RemoteCacheNoWaitFacade.java 15 Apr 2004 19:22:47 -0000 1.7
+++ RemoteCacheNoWaitFacade.java 12 Jun 2004 02:33:05 -0000 1.8
@@ -273,7 +273,7 @@
log.debug( "in failover for " + i );
}
//if ( noWaits.length == 1 ) {
- if ( rca.getRemoteType() == rca.LOCAL )
+ if ( rca.getRemoteType() == RemoteCacheAttributes.LOCAL )
{
if ( noWaits[ i ].getStatus() == CacheConstants.STATUS_ERROR )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
