You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@avalon.apache.org by bl...@apache.org on 2001/04/04 20:05:50 UTC

cvs commit: jakarta-avalon/src/java/org/apache/avalon/util/datasource JdbcConnectionPool.java

bloritsch    01/04/04 11:05:50

  Modified:    proposal/4.0/src/java/org/apache/avalon/datasource
                        JdbcConnectionPool.java
               src/java/org/apache/avalon/util/datasource
                        JdbcConnectionPool.java
  Log:
  Avoid infinite loop if datasource cannot be instantiated due to licensing
  issues, etc.
  
  Revision  Changes    Path
  1.10      +1 -11     jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/JdbcConnectionPool.java
  
  Index: JdbcConnectionPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/proposal/4.0/src/java/org/apache/avalon/datasource/JdbcConnectionPool.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JdbcConnectionPool.java	2001/04/04 15:40:37	1.9
  +++ JdbcConnectionPool.java	2001/04/04 18:05:48	1.10
  @@ -26,7 +26,7 @@
    * thread to manage the number of SQL Connections.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/04/04 15:40:37 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/04/04 18:05:48 $
    */
   public class JdbcConnectionPool
       extends AbstractLoggable
  @@ -187,16 +187,6 @@
                   m_ready.add( createJdbcConnection() );
               } catch (SQLException se) {
                   getLogger().error( "Could not create connection to database", se );
  -            }
  -        }
  -
  -        if ((m_ready.size() < m_max) && (m_ready.size() > 0)) {
  -            while (m_ready.size() < m_max) {
  -                try {
  -                    m_ready.add( createJdbcConnection() );
  -                } catch (SQLException se) {
  -                    getLogger().error( "Could not create connection to database", se );
  -                }
               }
           }
   
  
  
  
  1.10      +1 -11     jakarta-avalon/src/java/org/apache/avalon/util/datasource/JdbcConnectionPool.java
  
  Index: JdbcConnectionPool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon/src/java/org/apache/avalon/util/datasource/JdbcConnectionPool.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- JdbcConnectionPool.java	2001/03/16 20:18:57	1.9
  +++ JdbcConnectionPool.java	2001/04/04 18:05:50	1.10
  @@ -26,7 +26,7 @@
    * thread to manage the number of SQL Connections.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.9 $ $Date: 2001/03/16 20:18:57 $
  + * @version CVS $Revision: 1.10 $ $Date: 2001/04/04 18:05:50 $
    */
   public class JdbcConnectionPool
       extends AbstractLoggable
  @@ -187,16 +187,6 @@
                   m_ready.add( createJdbcConnection() );
               } catch (SQLException se) {
                   getLogger().error( "Could not create connection to database", se );
  -            }
  -        }
  -
  -        if ((m_ready.size() < m_max) && (m_ready.size() > 0)) {
  -            while (m_ready.size() < m_max) {
  -                try {
  -                    m_ready.add( createJdbcConnection() );
  -                } catch (SQLException se) {
  -                    getLogger().error( "Could not create connection to database", se );
  -                }
               }
           }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: avalon-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: avalon-dev-help@jakarta.apache.org