Return-Path: 
 <avalon-cvs-return-3591-qmlist-jakarta-archive-avalon-cvs=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-avalon-cvs-archive@apache.org
Received: (qmail 93299 invoked from network); 17 Jan 2002 13:27:23 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 17 Jan 2002 13:27:23 -0000
Received: (qmail 11966 invoked by uid 97); 17 Jan 2002 13:27:23 -0000
Delivered-To: qmlist-jakarta-archive-avalon-cvs@jakarta.apache.org
Received: (qmail 11950 invoked by uid 97); 17 Jan 2002 13:27:22 -0000
Mailing-List: contact avalon-cvs-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:avalon-cvs-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:avalon-cvs-subscribe@jakarta.apache.org>
List-Help: <mailto:avalon-cvs-help@jakarta.apache.org>
List-Post: <mailto:avalon-cvs@jakarta.apache.org>
List-Id: "Avalon CVS List" <avalon-cvs.jakarta.apache.org>
Reply-To: "Avalon Developers List" <avalon-dev@jakarta.apache.org>
Delivered-To: mailing list avalon-cvs@jakarta.apache.org
Received: (qmail 11939 invoked by uid 97); 17 Jan 2002 13:27:22 -0000
Date: 17 Jan 2002 13:27:20 -0000
Message-ID: <20020117132720.77433.qmail@icarus.apache.org>
From: bloritsch@apache.org
To: jakarta-avalon-excalibur-cvs@apache.org
Subject: cvs commit:
 jakarta-avalon-excalibur/src/java/org/apache/avalon/excalibur/datasource
 AbstractJdbcConnection.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

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>