You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2002/04/02 16:29:15 UTC
cvs commit: jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/datasource JdbcConnectionPool.java
bloritsch 02/04/02 06:29:15
Modified: all/src/java/org/apache/avalon/excalibur/datasource
JdbcConnectionPool.java
Log:
Fix error with datasources. The Pool would throw an exception if the class did not extend JdbcConnection
Revision Changes Path
1.16 +6 -6 jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/datasource/JdbcConnectionPool.java
Index: JdbcConnectionPool.java
===================================================================
RCS file: /home/cvs/jakarta-avalon-excalibur/all/src/java/org/apache/avalon/excalibur/datasource/JdbcConnectionPool.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- JdbcConnectionPool.java 16 Mar 2002 00:05:40 -0000 1.15
+++ JdbcConnectionPool.java 2 Apr 2002 14:29:15 -0000 1.16
@@ -20,7 +20,7 @@
* thread to manage the number of SQL Connections.
*
* @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
- * @version CVS $Revision: 1.15 $ $Date: 2002/03/16 00:05:40 $
+ * @version CVS $Revision: 1.16 $ $Date: 2002/04/02 14:29:15 $
* @since 4.0
*/
public class JdbcConnectionPool
@@ -66,11 +66,11 @@
protected final Poolable newPoolable() throws Exception
{
- JdbcConnection conn = null;
+ AbstractJdbcConnection conn = null;
if( m_wait < 1 )
{
- conn = (JdbcConnection)super.newPoolable();
+ conn = (AbstractJdbcConnection)super.newPoolable();
}
else
{
@@ -95,7 +95,7 @@
try
{
- conn = (JdbcConnection)super.newPoolable();
+ conn = (AbstractJdbcConnection)super.newPoolable();
}
finally
{
@@ -132,7 +132,7 @@
}
}
- JdbcConnection obj = (JdbcConnection)super.get();
+ AbstractJdbcConnection obj = (AbstractJdbcConnection)super.get();
if( obj.isClosed() )
{
@@ -151,7 +151,7 @@
this.removePoolable( obj );
- obj = (JdbcConnection)this.newPoolable();
+ obj = (AbstractJdbcConnection)this.newPoolable();
m_active.add( obj );
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>