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 2004/11/16 08:40:42 UTC
cvs commit: jakarta-turbine-jcs/src/java/org/apache/jcs/admin CacheRegionInfo.java
asmuts 2004/11/15 23:40:42
Modified: src/java/org/apache/jcs/auxiliary/remote/server
RemoteCacheServer.java
RemoteCacheClusterMonitor.java
src/java/org/apache/jcs/auxiliary/remote
RemoteCacheMonitor.java RemoteCacheManager.java
RemoteCacheListener.java
src/java/org/apache/jcs/access/monitor MonitorAccess.java
src/java/org/apache/jcs/auxiliary/lateral/javagroups
LateralGroupCacheJGListener.java
LateralCacheJGListener.java JGConnectionHolder.java
src/java/org/apache/jcs/auxiliary/lateral
LateralCacheMonitor.java LateralCacheManager.java
src/java/org/apache/jcs/auxiliary/disk/jisp
JISPCacheManager.java
src/java/org/apache/jcs/auxiliary/disk/indexed
IndexedDiskCacheManager.java
src/java/org/apache/jcs/auxiliary/disk/hsql
HSQLCacheManager.java
src/java/org/apache/jcs/access GroupCacheAccess.java
CacheAccess.java
src/java/org/apache/jcs/admin CacheRegionInfo.java
Log:
Removed old double check locking code.
Revision Changes Path
1.18 +4 -4 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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RemoteCacheServer.java 12 Jun 2004 02:33:05 -0000 1.17
+++ RemoteCacheServer.java 16 Nov 2004 07:39:40 -0000 1.18
@@ -163,9 +163,9 @@
NotBoundException
{
CacheListeners cacheListeners = ( CacheListeners ) cacheListenersMap.get( cacheName );
- if ( cacheListeners == null )
+ synchronized ( cacheListenersMap )
{
- synchronized ( cacheListenersMap )
+ if ( cacheListeners == null )
{
cacheListeners = ( CacheListeners ) cacheListenersMap.get( cacheName );
if ( cacheListeners == null )
@@ -191,9 +191,9 @@
NotBoundException
{
CacheListeners cacheListeners = ( CacheListeners ) clusterListenersMap.get( cacheName );
- if ( cacheListeners == null )
+ synchronized ( clusterListenersMap )
{
- synchronized ( clusterListenersMap )
+ if ( cacheListeners == null )
{
cacheListeners = ( CacheListeners ) clusterListenersMap.get( cacheName );
if ( cacheListeners == null )
1.7 +3 -6 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheClusterMonitor.java
Index: RemoteCacheClusterMonitor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/server/RemoteCacheClusterMonitor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RemoteCacheClusterMonitor.java 12 Jun 2004 02:33:26 -0000 1.6
+++ RemoteCacheClusterMonitor.java 16 Nov 2004 07:39:43 -0000 1.7
@@ -75,14 +75,11 @@
*/
static RemoteCacheClusterMonitor getInstance()
{
- if ( instance == null )
+ synchronized ( RemoteCacheClusterMonitor.class )
{
- synchronized ( RemoteCacheClusterMonitor.class )
+ if ( instance == null )
{
- if ( instance == null )
- {
- return instance = new RemoteCacheClusterMonitor();
- }
+ return instance = new RemoteCacheClusterMonitor();
}
}
return instance;
1.7 +3 -6 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheMonitor.java
Index: RemoteCacheMonitor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheMonitor.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- RemoteCacheMonitor.java 12 Jun 2004 02:33:26 -0000 1.6
+++ RemoteCacheMonitor.java 16 Nov 2004 07:40:41 -0000 1.7
@@ -78,14 +78,11 @@
*/
static RemoteCacheMonitor getInstance()
{
- if ( instance == null )
+ synchronized ( RemoteCacheMonitor.class )
{
- synchronized ( RemoteCacheMonitor.class )
+ if ( instance == null )
{
- if ( instance == null )
- {
- return instance = new RemoteCacheMonitor();
- }
+ return instance = new RemoteCacheMonitor();
}
}
return instance;
1.9 +2 -2 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java
Index: RemoteCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- RemoteCacheManager.java 15 Apr 2004 19:22:47 -0000 1.8
+++ RemoteCacheManager.java 16 Nov 2004 07:40:41 -0000 1.9
@@ -180,9 +180,9 @@
Location loc = new Location( host, port );
RemoteCacheManager ins = ( RemoteCacheManager ) instances.get( loc );
- if ( ins == null )
+ synchronized ( instances )
{
- synchronized ( instances )
+ if ( ins == null )
{
ins = ( RemoteCacheManager ) instances.get( loc );
if ( ins == null )
1.12 +3 -6 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java
Index: RemoteCacheListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/remote/RemoteCacheListener.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- RemoteCacheListener.java 12 Jun 2004 02:33:26 -0000 1.11
+++ RemoteCacheListener.java 16 Nov 2004 07:40:41 -0000 1.12
@@ -162,14 +162,11 @@
public static IRemoteCacheListener getInstance( IRemoteCacheAttributes irca )
{
//throws IOException, NotBoundException
- if ( instance == null )
+ synchronized ( RemoteCacheListener.class )
{
- synchronized ( RemoteCacheListener.class )
+ if ( instance == null )
{
- if ( instance == null )
- {
- instance = new RemoteCacheListener( irca );
- }
+ instance = new RemoteCacheListener( irca );
}
}
//instance.incrementClients();
1.10 +3 -7 jakarta-turbine-jcs/src/java/org/apache/jcs/access/monitor/MonitorAccess.java
Index: MonitorAccess.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/access/monitor/MonitorAccess.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MonitorAccess.java 15 Apr 2004 19:22:55 -0000 1.9
+++ MonitorAccess.java 16 Nov 2004 07:40:41 -0000 1.10
@@ -46,15 +46,11 @@
/** Constructor for the MonitorAccess object */
public MonitorAccess()
{
- // FIXME: Removed double-checked locking.
- if ( cacheMgr == null )
+ synchronized ( GroupCacheAccess.class )
{
- synchronized ( GroupCacheAccess.class )
+ if ( cacheMgr == null )
{
- if ( cacheMgr == null )
- {
- cacheMgr = CompositeCacheManager.getInstance();
- }
+ cacheMgr = CompositeCacheManager.getInstance();
}
}
}
1.5 +10 -12 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java
Index: LateralGroupCacheJGListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralGroupCacheJGListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LateralGroupCacheJGListener.java 11 May 2004 01:04:36 -0000 1.4
+++ LateralGroupCacheJGListener.java 16 Nov 2004 07:40:41 -0000 1.5
@@ -58,22 +58,20 @@
{
//throws IOException, NotBoundException
ILateralCacheListener ins = ( ILateralCacheListener ) instances.get( String.valueOf( ilca.getUdpMulticastAddr() ) );
- if ( ins == null )
+ synchronized ( LateralGroupCacheJGListener.class )
{
- synchronized ( LateralGroupCacheJGListener.class )
+ if ( ins == null )
{
- if ( ins == null )
- {
- ins = new LateralGroupCacheJGListener( ilca );
- ins.init();
- }
- if ( log.isDebugEnabled() )
- {
- log.debug( "created new listener " + ilca.getUdpMulticastAddr() );
- }
- instances.put( String.valueOf( ilca.getUdpMulticastAddr() ), ins );
+ ins = new LateralGroupCacheJGListener( ilca );
+ ins.init();
}
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "created new listener " + ilca.getUdpMulticastAddr() );
+ }
+ instances.put( String.valueOf( ilca.getUdpMulticastAddr() ), ins );
}
+
return ins;
}
1.10 +11 -12 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java
Index: LateralCacheJGListener.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/LateralCacheJGListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- LateralCacheJGListener.java 12 Jun 2004 02:34:12 -0000 1.9
+++ LateralCacheJGListener.java 16 Nov 2004 07:40:41 -0000 1.10
@@ -141,22 +141,21 @@
//throws IOException, NotBoundException
ILateralCacheListener ins = ( ILateralCacheListener ) instances.get( ilca.getJGChannelProperties() );
- if ( ins == null )
+
+ synchronized ( LateralCacheJGListener.class )
{
- synchronized ( LateralCacheJGListener.class )
+ if ( ins == null )
{
- if ( ins == null )
- {
- ins = new LateralCacheJGListener( ilca );
- ins.init();
- }
- if ( log.isInfoEnabled() )
- {
- log.info( "created new listener " + ilca.getJGChannelProperties() );
- }
- instances.put( ilca.getJGChannelProperties(), ins );
+ ins = new LateralCacheJGListener( ilca );
+ ins.init();
}
+ if ( log.isInfoEnabled() )
+ {
+ log.info( "created new listener " + ilca.getJGChannelProperties() );
+ }
+ instances.put( ilca.getJGChannelProperties(), ins );
}
+
return ins;
}
1.6 +8 -11 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java
Index: JGConnectionHolder.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/javagroups/JGConnectionHolder.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JGConnectionHolder.java 12 Jun 2004 02:34:12 -0000 1.5
+++ JGConnectionHolder.java 16 Nov 2004 07:40:41 -0000 1.6
@@ -63,20 +63,17 @@
JGConnectionHolder ins = ( JGConnectionHolder ) instances.get( ilca.getJGChannelProperties() );
try
{
- if ( ins == null )
+ synchronized ( JGConnectionHolder.class )
{
- synchronized ( JGConnectionHolder.class )
+ if ( ins == null )
{
- if ( ins == null )
- {
- ins = new JGConnectionHolder( ilca );
- }
- if ( log.isDebugEnabled() )
- {
- log.debug( "created new listener " + ilca.getJGChannelProperties() );
- }
- instances.put( ilca.getJGChannelProperties(), ins );
+ ins = new JGConnectionHolder( ilca );
}
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( "created new listener " + ilca.getJGChannelProperties() );
+ }
+ instances.put( ilca.getJGChannelProperties(), ins );
}
}
catch ( Exception e )
1.8 +3 -6 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java
Index: LateralCacheMonitor.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheMonitor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- LateralCacheMonitor.java 16 Jul 2004 01:27:42 -0000 1.7
+++ LateralCacheMonitor.java 16 Nov 2004 07:40:41 -0000 1.8
@@ -73,14 +73,11 @@
*/
static LateralCacheMonitor getInstance()
{
- if ( instance == null )
+ synchronized ( LateralCacheMonitor.class )
{
- synchronized ( LateralCacheMonitor.class )
+ if ( instance == null )
{
- if ( instance == null )
- {
- return instance = new LateralCacheMonitor();
- }
+ return instance = new LateralCacheMonitor();
}
}
return instance;
1.11 +4 -4 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheManager.java
Index: LateralCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/lateral/LateralCacheManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LateralCacheManager.java 16 Jul 2004 01:27:42 -0000 1.10
+++ LateralCacheManager.java 16 Nov 2004 07:40:41 -0000 1.11
@@ -85,12 +85,12 @@
public static LateralCacheManager getInstance( ILateralCacheAttributes lca )
{
LateralCacheManager ins = ( LateralCacheManager ) instances.get( lca.toString() );
- if ( ins == null )
+ synchronized ( instances )
{
- log.info( "Instance for [" + lca.toString() + "] is null, creating" );
-
- synchronized ( instances )
+ if ( ins == null )
{
+ log.info( "Instance for [" + lca.toString() + "] is null, creating" );
+
ins = ( LateralCacheManager ) instances.get( lca.toString() );
if ( ins == null )
{
1.7 +3 -6 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/jisp/JISPCacheManager.java
Index: JISPCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/jisp/JISPCacheManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JISPCacheManager.java 12 Jun 2004 02:34:12 -0000 1.6
+++ JISPCacheManager.java 16 Nov 2004 07:40:41 -0000 1.7
@@ -70,14 +70,11 @@
*/
public static JISPCacheManager getInstance( JISPCacheAttributes cattr )
{
- if ( instance == null )
+ synchronized ( JISPCacheManager.class )
{
- synchronized ( JISPCacheManager.class )
+ if ( instance == null )
{
- if ( instance == null )
- {
- instance = new JISPCacheManager( cattr );
- }
+ instance = new JISPCacheManager( cattr );
}
}
1.6 +5 -8 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java
Index: IndexedDiskCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/indexed/IndexedDiskCacheManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IndexedDiskCacheManager.java 15 Apr 2004 19:22:57 -0000 1.5
+++ IndexedDiskCacheManager.java 16 Nov 2004 07:40:41 -0000 1.6
@@ -68,15 +68,12 @@
public static IndexedDiskCacheManager getInstance(
IndexedDiskCacheAttributes defaultCacheAttributes )
{
- if ( instance == null )
+ synchronized ( IndexedDiskCacheManager.class )
{
- synchronized ( IndexedDiskCacheManager.class )
+ if ( instance == null )
{
- if ( instance == null )
- {
- instance =
- new IndexedDiskCacheManager( defaultCacheAttributes );
- }
+ instance =
+ new IndexedDiskCacheManager( defaultCacheAttributes );
}
}
1.8 +3 -6 jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/hsql/HSQLCacheManager.java
Index: HSQLCacheManager.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/auxiliary/disk/hsql/HSQLCacheManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HSQLCacheManager.java 12 Jun 2004 02:34:13 -0000 1.7
+++ HSQLCacheManager.java 16 Nov 2004 07:40:42 -0000 1.8
@@ -74,14 +74,11 @@
*/
public static HSQLCacheManager getInstance( HSQLCacheAttributes cattr )
{
- if ( instance == null )
+ synchronized ( HSQLCacheManager.class )
{
- synchronized ( HSQLCacheManager.class )
+ if ( instance == null )
{
- if ( instance == null )
- {
- instance = new HSQLCacheManager( cattr );
- }
+ instance = new HSQLCacheManager( cattr );
}
}
1.14 +12 -18 jakarta-turbine-jcs/src/java/org/apache/jcs/access/GroupCacheAccess.java
Index: GroupCacheAccess.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/access/GroupCacheAccess.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- GroupCacheAccess.java 12 Jun 2004 02:34:13 -0000 1.13
+++ GroupCacheAccess.java 16 Nov 2004 07:40:42 -0000 1.14
@@ -56,14 +56,11 @@
public static GroupCacheAccess getGroupAccess( String region )
throws CacheException
{
- if ( cacheMgr == null )
+ synchronized ( GroupCacheAccess.class )
{
- synchronized ( GroupCacheAccess.class )
+ if ( cacheMgr == null )
{
- if ( cacheMgr == null )
- {
- cacheMgr = CompositeCacheManager.getInstance();
- }
+ cacheMgr = CompositeCacheManager.getInstance();
}
}
return new GroupCacheAccess( cacheMgr.getCache( region ) );
@@ -77,14 +74,11 @@
public static GroupCacheAccess getGroupAccess( String region, ICompositeCacheAttributes icca )
throws CacheException
{
- if ( cacheMgr == null )
+ synchronized ( GroupCacheAccess.class )
{
- synchronized ( GroupCacheAccess.class )
+ if ( cacheMgr == null )
{
- if ( cacheMgr == null )
- {
- cacheMgr = CompositeCacheManager.getInstance();
- }
+ cacheMgr = CompositeCacheManager.getInstance();
}
}
@@ -136,20 +130,20 @@
* @param value The object to cache
* @param attr The objects attributes.
*/
- public void putInGroup( Object name, String groupName, Object value,
+ public void putInGroup( Object name, String groupName, Object value,
IElementAttributes attr )
throws CacheException
{
// unbind object first if any.
remove( name, groupName);
- if (attr == null)
+ if (attr == null)
{
- put( getGroupAttrName(groupName, name), value );
+ put( getGroupAttrName(groupName, name), value );
}
- else
+ else
{
- put( getGroupAttrName(groupName, name), value, attr );
+ put( getGroupAttrName(groupName, name), value, attr );
}
}
@@ -157,7 +151,7 @@
public void remove( Object name, String group )
{
GroupAttrName key = getGroupAttrName( group, name );
- cacheControl.remove(key);
+ cacheControl.remove(key);
}
/**
1.15 +4 -7 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CacheAccess.java 16 Jul 2004 01:29:29 -0000 1.14
+++ CacheAccess.java 16 Nov 2004 07:40:42 -0000 1.15
@@ -173,14 +173,11 @@
*/
protected static void ensureCacheManager()
{
- if ( cacheMgr == null )
+ synchronized ( CacheAccess.class )
{
- synchronized ( CacheAccess.class )
+ if ( cacheMgr == null )
{
- if ( cacheMgr == null )
- {
- cacheMgr = CompositeCacheManager.getInstance();
- }
+ cacheMgr = CompositeCacheManager.getInstance();
}
}
}
1.2 +11 -0 jakarta-turbine-jcs/src/java/org/apache/jcs/admin/CacheRegionInfo.java
Index: CacheRegionInfo.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-jcs/src/java/org/apache/jcs/admin/CacheRegionInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CacheRegionInfo.java 9 Jun 2004 04:11:20 -0000 1.1
+++ CacheRegionInfo.java 16 Nov 2004 07:40:42 -0000 1.2
@@ -44,4 +44,15 @@
: status == CacheConstants.STATUS_ERROR ? "ERROR"
: "UNKNOWN" );
}
+
+ /**
+ * Return the stats for the region.
+ *
+ * @return String
+ */
+ public String getStats()
+ {
+ return cache.getStats();
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-jcs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-jcs-dev-help@jakarta.apache.org