craigmcc    01/02/09 12:48:35

  Modified:    src/share/org/apache/struts/util GenericConnection.java
  Log:
  Catch AbstractMethodError from mm.mysql JDBC driver in the close() method
  as well.
  
  Submitted by: Sudheendra Hebbagilu <[EMAIL PROTECTED]>
  
  Revision  Changes    Path
  1.8       +9 -7      
jakarta-struts/src/share/org/apache/struts/util/GenericConnection.java
  
  Index: GenericConnection.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericConnection.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- GenericConnection.java    2001/01/31 22:36:54     1.7
  +++ GenericConnection.java    2001/02/09 20:48:34     1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericConnection.java,v 1.7 
2001/01/31 22:36:54 craigmcc Exp $
  - * $Revision: 1.7 $
  - * $Date: 2001/01/31 22:36:54 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/GenericConnection.java,v 1.8 
2001/02/09 20:48:34 craigmcc Exp $
  + * $Revision: 1.8 $
  + * $Date: 2001/02/09 20:48:34 $
    *
    * ====================================================================
    *
  @@ -82,7 +82,7 @@
    *
    * @author Craig R. McClanahan
    * @author Ted Husted
  - * @version $Revision: 1.7 $ $Date: 2001/01/31 22:36:54 $
  + * @version $Revision: 1.8 $ $Date: 2001/02/09 20:48:34 $
   
    */
   
  @@ -242,15 +242,17 @@
           }
           try {
               conn.setTypeMap(this.map);
  +        } catch (SQLException e) {
  +            ;   // PostgreSQL throws a "not yet implemented" exception
           } catch (UnsupportedOperationException e) {
               ;   // JDBC-ODBC driver throws this
  -        } catch (SQLException e) {
  -            ;
  +        } catch (AbstractMethodError e) {
  +            ;   // mm.mysql throws this
           }
           try {
               conn.setReadOnly(this.readOnly);
           } catch (SQLException e) {
  -            ;
  +            ;   // Informix throws a "not supported" exception
           }
           try {
               conn.clearWarnings();
  
  
  

Reply via email to