Author: sandymac
Date: Fri Mar 24 23:03:00 2006
New Revision: 388716
URL: http://svn.apache.org/viewcvs?rev=388716&view=rev
Log:
Move the shared timer to the CompositeObjectPool class.
Modified:
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPool.java
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/EvictorLender.java
Modified:
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPool.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPool.java?rev=388716&r1=388715&r2=388716&view=diff
==============================================================================
---
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPool.java
(original)
+++
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/CompositeObjectPool.java
Fri Mar 24 23:03:00 2006
@@ -23,6 +23,7 @@
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
+import java.util.Timer;
/**
* An object pool who's behavior and functionality is determined by
composition.
@@ -51,6 +52,12 @@
final class CompositeObjectPool implements ObjectPool, Cloneable, Serializable
{
private static final long serialVersionUID = -5874499972956918952L;
+
+ /**
+ * Shared Timer for use by various parts of the composite implementation.
+ * XXX: When Java 1.5 is acceptable convert this to a
java.util.concurrent.ScheduledThreadPoolExecutor
+ */
+ static final Timer COMPOSITE_TIMER = new Timer(true);
/**
* Factory used by this pool.
Modified:
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/EvictorLender.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/EvictorLender.java?rev=388716&r1=388715&r2=388716&view=diff
==============================================================================
---
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/EvictorLender.java
(original)
+++
jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/composite/EvictorLender.java
Fri Mar 24 23:03:00 2006
@@ -35,11 +35,6 @@
private static final long serialVersionUID = 4040627184050939757L;
/**
- * Shared evictor timer used by all [EMAIL PROTECTED] EvictorLender}s.
- */
- private static final Timer EVICTOR = new Timer(true);
-
- /**
* If this evictor delegates to another evictor then don't bother pruning
when [EMAIL PROTECTED] #size()} is called because the
* delegate will do that too.
*/
@@ -123,7 +118,7 @@
*/
protected final Timer getTimer() {
// Future version may want to manage more than one TimerTask. For now
one is fine.
- return EVICTOR;
+ return CompositeObjectPool.COMPOSITE_TIMER;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
