cvs commit: jakarta-struts/src/share/org/apache/struts/util GenericDataSource.java

[craigmcc]

craigmcc    01/06/09 20:36:50

  Modified:    src/share/org/apache/struts/util Tag: STRUTS_1_0_BRANCH
                        GenericDataSource.java
  Log:
  Correct stupid cut-n-paste typo that caused NPE when using pingQuery.
  
  PR: Bugzilla #1980
  Submitted by: Howard Moore <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.5.2.2   +5 -5      
jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java
  
  Index: GenericDataSource.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- GenericDataSource.java    2001/06/02 23:06:52     1.5.2.1
  +++ GenericDataSource.java    2001/06/10 03:36:50     1.5.2.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v 
1.5.2.1 2001/06/02 23:06:52 craigmcc Exp $
  - * $Revision: 1.5.2.1 $
  - * $Date: 2001/06/02 23:06:52 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericDataSource.java,v 
1.5.2.2 2001/06/10 03:36:50 craigmcc Exp $
  + * $Revision: 1.5.2.2 $
  + * $Date: 2001/06/10 03:36:50 $
    *
    * ====================================================================
    *
  @@ -178,7 +178,7 @@
    *
    * @author Craig R. McClanahan
    * @author Ted Husted
  - * @version $Revision: 1.5.2.1 $ $Date: 2001/06/02 23:06:52 $
  + * @version $Revision: 1.5.2.2 $ $Date: 2001/06/10 03:36:50 $
    */
   
   public class GenericDataSource implements DataSource {
  @@ -816,7 +816,7 @@
               ResultSet rs = null;
               Statement stmt = conn.createStatement();
               try {
  -                rs = stmt.executeQuery(pingCommand);
  +                rs = stmt.executeQuery(pingQuery);
                   while (rs.next()) {
                       ;
                   }