bloritsch 01/03/16 11:46:57
Modified: src/java/org/apache/avalon/util/pool AbstractPool.java
DefaultObjectFactory.java ObjectFactory.java
SingleThreadedPool.java
SoftResourceLimitingPool.java
src/java/org/apache/avalon/util/thread
DefaultThreadPool.java
Log:
Made Changes to ObjectFactory so that it can be used outside
of a Pool. This is necessary for hiding differences between types
of components and keeping the same management interface.
Revision Changes Path
1.4 +2 -2
jakarta-avalon/src/java/org/apache/avalon/util/pool/AbstractPool.java
Index: AbstractPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/pool/AbstractPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractPool.java 2001/03/05 18:56:32 1.3
+++ AbstractPool.java 2001/03/16 19:46:48 1.4
@@ -97,7 +97,7 @@
if( 0 == m_ready.size() )
{
- obj = m_factory.newInstance();
+ obj = (Poolable)m_factory.newInstance();
m_currentCount++;
}
else
@@ -121,4 +121,4 @@
if (getLogger() != null)
getLogger().debug( m_factory.getCreatedClass().getName() + ": returned
to the pool." );
}
-}
\ No newline at end of file
+}
1.3 +2 -2
jakarta-avalon/src/java/org/apache/avalon/util/pool/DefaultObjectFactory.java
Index: DefaultObjectFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/pool/DefaultObjectFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultObjectFactory.java 2001/03/01 20:10:51 1.2
+++ DefaultObjectFactory.java 2001/03/16 19:46:49 1.3
@@ -51,7 +51,7 @@
return m_constructor.getDeclaringClass();
}
- public Poolable newInstance()
+ public Object newInstance()
{
try
{
@@ -64,7 +64,7 @@
}
}
- public void decommission(Poolable object)
+ public void decommission(Object object)
{
object = null;
}
1.3 +2 -2
jakarta-avalon/src/java/org/apache/avalon/util/pool/ObjectFactory.java
Index: ObjectFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/pool/ObjectFactory.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjectFactory.java 2001/03/01 20:10:53 1.2
+++ ObjectFactory.java 2001/03/16 19:46:50 1.3
@@ -20,7 +20,7 @@
public interface ObjectFactory
extends Component
{
- Poolable newInstance() throws Exception;
+ Object newInstance() throws Exception;
Class getCreatedClass();
- void decommission(Poolable object) throws Exception;
+ void decommission(Object object) throws Exception;
}
1.2 +2 -2
jakarta-avalon/src/java/org/apache/avalon/util/pool/SingleThreadedPool.java
Index: SingleThreadedPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/pool/SingleThreadedPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SingleThreadedPool.java 2001/03/01 20:10:53 1.1
+++ SingleThreadedPool.java 2001/03/16 19:46:50 1.2
@@ -67,7 +67,7 @@
if( 0 == m_count )
{
- return m_factory.newInstance();
+ return (Poolable)m_factory.newInstance();
}
m_count--;
@@ -130,7 +130,7 @@
for( int i = m_count; i < size; i++ )
{
- m_pool[i] = m_factory.newInstance();
+ m_pool[i] = (Poolable)m_factory.newInstance();
}
m_count = size;
1.2 +2 -2
jakarta-avalon/src/java/org/apache/avalon/util/pool/SoftResourceLimitingPool.java
Index: SoftResourceLimitingPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/pool/SoftResourceLimitingPool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SoftResourceLimitingPool.java 2001/03/05 18:56:33 1.1
+++ SoftResourceLimitingPool.java 2001/03/16 19:46:51 1.2
@@ -77,7 +77,7 @@
for (int i = 0; i < amount; i++) {
if (this.m_ready.size() > this.m_min) {
try {
- this.m_factory.decommission( (Poolable) this.m_ready.pop() );
+ this.m_factory.decommission( this.m_ready.pop() );
this.m_currentCount--;
} catch (Exception e) {
if (getLogger() != null)
@@ -103,4 +103,4 @@
super.put(obj);
}
-}
\ No newline at end of file
+}
1.4 +2 -2
jakarta-avalon/src/java/org/apache/avalon/util/thread/DefaultThreadPool.java
Index: DefaultThreadPool.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/thread/DefaultThreadPool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultThreadPool.java 2001/03/15 11:21:41 1.3
+++ DefaultThreadPool.java 2001/03/16 19:46:56 1.4
@@ -48,7 +48,7 @@
m_logger = logger;
}
- public Poolable newInstance()
+ public Object newInstance()
{
final WorkerThread worker =
new WorkerThread( this, this, m_pool, getName() + " Worker #" +
m_level++ );
@@ -57,7 +57,7 @@
return worker;
}
- public void decommission( final Poolable object )
+ public void decommission( final Object object )
{
if( object instanceof WorkerThread )
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
