avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource AbstractJdbcConnection.java
Date Thu, 17 Jan 2002 13:27:20 GMT
bloritsch    02/01/17 05:27:20

  Modified:    src/java/org/apache/avalon/excalibur/datasource
                        AbstractJdbcConnection.java
  Log:
  Apply fix from Annette Doyle (Anette.Doyle@calabtech.com)
  
  Revision  Changes    Path
  1.6       +7 -7      jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java
  
  Index: AbstractJdbcConnection.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource/AbstractJdbcConnection.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AbstractJdbcConnection.java	15 Jan 2002 17:07:04 -0000	1.5
  +++ AbstractJdbcConnection.java	17 Jan 2002 13:27:20 -0000	1.6
  @@ -29,7 +29,7 @@
    * total number of Connection objects that are created.
    *
    * @author <a href="mailto:bloritsch@apache.org">Berin Loritsch</a>
  - * @version CVS $Revision: 1.5 $ $Date: 2002/01/15 17:07:04 $
  + * @version CVS $Revision: 1.6 $ $Date: 2002/01/17 13:27:20 $
    * @since 4.1
    */
   public abstract class AbstractJdbcConnection
  @@ -63,7 +63,12 @@
           // subclasses can override initialize()
           this.initialize();
   
  -        if (null != keepAlive && "".equals(keepAlive.trim()))
  +        if (null == keepAlive && "".equals(keepAlive.trim()))
  +        {
  +            m_testStatement = null;
  +            m_testException = null;
  +        }
  +        else
           {
               try
               {
  @@ -74,11 +79,6 @@
                   m_testStatement = null;
                   m_testException = se;
               }
  -        }
  -        else
  -        {
  -            m_testStatement = null;
  -            m_testException = null;
           }
       }
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:avalon-cvs-help@jakarta.apache.org>


Mime
View raw message