You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2014/04/03 02:35:41 UTC
svn commit: r1584228 - in /commons/proper/jcs/trunk/src:
java/org/apache/commons/jcs/auxiliary/disk/
java/org/apache/commons/jcs/auxiliary/disk/block/
java/org/apache/commons/jcs/auxiliary/disk/indexed/
java/org/apache/commons/jcs/auxiliary/disk/jdbc/m...
Author: sebb
Date: Thu Apr 3 00:35:40 2014
New Revision: 1584228
URL: http://svn.apache.org/r1584228
Log:
Don't share loggers between classes
Modified:
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheEventQueue.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/event/ElementEventQueue.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/AbstractDiskCache.java Thu Apr 3 00:35:40 2014
@@ -64,7 +64,7 @@ public abstract class AbstractDiskCache<
implements AuxiliaryCache<K, V>
{
/** The logger */
- protected static final Log log = LogFactory.getLog( AbstractDiskCache.class );
+ private static final Log log = LogFactory.getLog( AbstractDiskCache.class );
/** Generic disk cache attributes */
private IDiskCacheAttributes diskCacheAttributes = null;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskCache.java Thu Apr 3 00:35:40 2014
@@ -61,7 +61,7 @@ public class BlockDiskCache<K extends Se
private static final long serialVersionUID = 1L;
/** The logger. */
- protected static final Log log = LogFactory.getLog( BlockDiskCache.class );
+ private static final Log log = LogFactory.getLog( BlockDiskCache.class );
/** The name to prefix all log messages with. */
private final String logCacheName;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/block/BlockDiskKeyStore.java Thu Apr 3 00:35:40 2014
@@ -46,7 +46,7 @@ import org.apache.commons.logging.LogFac
public class BlockDiskKeyStore<K extends Serializable>
{
/** The logger */
- protected static final Log log = LogFactory.getLog( BlockDiskKeyStore.class );
+ private static final Log log = LogFactory.getLog( BlockDiskKeyStore.class );
/** Attributes governing the behavior of the block disk cache. */
private final BlockDiskCacheAttributes blockDiskCacheAttributes;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/indexed/IndexedDiskCache.java Thu Apr 3 00:35:40 2014
@@ -65,7 +65,7 @@ public class IndexedDiskCache<K extends
extends AbstractDiskCache<K, V>
{
/** The logger */
- protected static final Log log = LogFactory.getLog( IndexedDiskCache.class );
+ private static final Log log = LogFactory.getLog( IndexedDiskCache.class );
/** Cache name used in log messages */
protected final String logCacheName;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/disk/jdbc/mysql/MySQLDiskCacheManager.java Thu Apr 3 00:35:40 2014
@@ -50,7 +50,7 @@ public class MySQLDiskCacheManager
private static final long serialVersionUID = -8258856770927857896L;
/** The logger */
- protected static final Log log = LogFactory.getLog( MySQLDiskCacheManager.class );
+ private static final Log log = LogFactory.getLog( MySQLDiskCacheManager.class );
/** The singleton instance. */
private static MySQLDiskCacheManager instance;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/auxiliary/lateral/socket/tcp/LateralTCPListener.java Thu Apr 3 00:35:40 2014
@@ -56,7 +56,7 @@ public class LateralTCPListener<K extend
implements ILateralCacheListener<K, V>, IShutdownObserver
{
/** The logger */
- protected final static Log log = LogFactory.getLog( LateralTCPListener.class );
+ private final static Log log = LogFactory.getLog( LateralTCPListener.class );
/** How long the server will block on an accept(). 0 is infinite. */
private final static int acceptTimeOut = 1000;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/AbstractCacheEventQueue.java Thu Apr 3 00:35:40 2014
@@ -35,7 +35,7 @@ public abstract class AbstractCacheEvent
implements ICacheEventQueue<K, V>
{
/** The logger. */
- protected static final Log log = LogFactory.getLog( AbstractCacheEventQueue.class );
+ private static final Log log = LogFactory.getLog( AbstractCacheEventQueue.class );
/** default */
protected static final int DEFAULT_WAIT_TO_DIE_MILLIS = 10000;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheEventQueue.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/CacheEventQueue.java Thu Apr 3 00:35:40 2014
@@ -27,6 +27,8 @@ import org.apache.commons.jcs.engine.sta
import org.apache.commons.jcs.engine.stats.Stats;
import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* An event queue is used to propagate ordered cache events to one and only one target listener.
@@ -38,6 +40,9 @@ import org.apache.commons.jcs.engine.sta
public class CacheEventQueue<K extends Serializable, V extends Serializable>
extends AbstractCacheEventQueue<K, V>
{
+ /** The logger. */
+ private static final Log log = LogFactory.getLog( CacheEventQueue.class );
+
/** The type of queue -- there are pooled and single */
private static final QueueType queueType = QueueType.SINGLE;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/PooledCacheEventQueue.java Thu Apr 3 00:35:40 2014
@@ -30,6 +30,8 @@ import org.apache.commons.jcs.engine.sta
import org.apache.commons.jcs.engine.stats.behavior.IStatElement;
import org.apache.commons.jcs.engine.stats.behavior.IStats;
import org.apache.commons.jcs.utils.threadpool.ThreadPoolManager;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* An event queue is used to propagate ordered cache events to one and only one target listener.
@@ -44,6 +46,9 @@ import org.apache.commons.jcs.utils.thre
public class PooledCacheEventQueue<K extends Serializable, V extends Serializable>
extends AbstractCacheEventQueue<K, V>
{
+ /** The logger. */
+ private static final Log log = LogFactory.getLog( PooledCacheEventQueue.class );
+
/** The type of event queue */
private static final QueueType queueType = QueueType.POOLED;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/CompositeCacheManager.java Thu Apr 3 00:35:40 2014
@@ -73,7 +73,7 @@ public class CompositeCacheManager
implements IRemoteCacheConstants, ICompositeCacheManager, IShutdownObservable, IProvideScheduler
{
/** The logger */
- protected final static Log log = LogFactory.getLog( CompositeCacheManager.class );
+ private final static Log log = LogFactory.getLog( CompositeCacheManager.class );
/** JMX object name */
private final static String JMX_OBJECT_NAME = "org.apache.commons.jcs:type=JCSAdminBean";
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/event/ElementEventQueue.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/event/ElementEventQueue.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/event/ElementEventQueue.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/control/event/ElementEventQueue.java Thu Apr 3 00:35:40 2014
@@ -37,7 +37,7 @@ public class ElementEventQueue
private static final long serialVersionUID = -2966341524571838475L;
/** The logger */
- protected final static Log log = LogFactory.getLog( ElementEventQueue.class );
+ private final static Log log = LogFactory.getLog( ElementEventQueue.class );
/** The cache (region) name. */
protected final String cacheName;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/engine/memory/lru/LHMLRUMemoryCache.java Thu Apr 3 00:35:40 2014
@@ -51,7 +51,7 @@ public class LHMLRUMemoryCache<K extends
private static final long serialVersionUID = 6403738094136424101L;
/** The Logger. */
- protected final static Log log = LogFactory.getLog( LRUMemoryCache.class );
+ private final static Log log = LogFactory.getLog( LRUMemoryCache.class );
/** number of hits */
protected int hitCnt = 0;
Modified: commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java (original)
+++ commons/proper/jcs/trunk/src/java/org/apache/commons/jcs/utils/discovery/UDPDiscoveryReceiver.java Thu Apr 3 00:35:40 2014
@@ -40,7 +40,7 @@ public class UDPDiscoveryReceiver
implements Runnable, IShutdownObserver
{
/** The log factory */
- protected final static Log log = LogFactory.getLog( UDPDiscoveryReceiver.class );
+ private final static Log log = LogFactory.getLog( UDPDiscoveryReceiver.class );
/** buffer */
private final byte[] mBuffer = new byte[65536];
Modified: commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java
URL: http://svn.apache.org/viewvc/commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java?rev=1584228&r1=1584227&r2=1584228&view=diff
==============================================================================
--- commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java (original)
+++ commons/proper/jcs/trunk/src/test/org/apache/commons/jcs/utils/threadpool/ThreadPoolUnitTest.java Thu Apr 3 00:35:40 2014
@@ -54,7 +54,6 @@ public class ThreadPoolUnitTest
// add 6
for ( int i = 1; i < 30; i++ )
{
- final ThreadPoolExecutor myPool = pool;
final int cnt = i;
pool.execute( new Runnable()
{