DO NOT REPLY [Bug 29393] New: - Protected QueryRunner.close() methods

[bu...@apache.org]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG 
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
<http://issues.apache.org/bugzilla/show_bug.cgi?id=29393>.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND 
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=29393

Protected QueryRunner.close() methods

           Summary: Protected QueryRunner.close() methods
           Product: Commons
           Version: unspecified
          Platform: All
        OS/Version: All
            Status: NEW
          Severity: Enhancement
          Priority: Other
         Component: DbUtils
        AssignedTo: commons-dev@jakarta.apache.org
        ReportedBy: info@mikkri.com


Index: QueryRunner.java
===================================================================
RCS file:
/home/cvspublic/jakarta-commons/dbutils/src/java/org/apache/commons/dbutils/QueryRunner.java,v
retrieving revision 1.10
diff -u -r1.10 QueryRunner.java
--- QueryRunner.java	15 Mar 2004 05:31:40 -0000	1.10
+++ QueryRunner.java	4 Jun 2004 13:54:04 -0000
@@ -20,6 +20,7 @@
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.Types;
 import java.util.Arrays;
 
@@ -86,7 +87,7 @@
         } catch (SQLException e) {
             this.rethrow(e, sql, params);
         } finally {
-            DbUtils.close(stmt);
+            close(stmt);
         }
 
         return rows;
@@ -111,7 +112,7 @@
         try {
             return this.batch(conn, sql, params);
         } finally {
-            DbUtils.close(conn);
+            close(conn);
         }
     }
 
@@ -222,9 +223,9 @@
 
         } finally {
             try {
-                DbUtils.close(rs);
+                close(rs);
             } finally {
-                DbUtils.close(stmt);
+                close(stmt);
             }
         }
 
@@ -290,7 +291,7 @@
             return this.query(conn, sql, params, rsh);
 
         } finally {
-            DbUtils.close(conn);
+            close(conn);
         }
     }
 
@@ -410,7 +411,7 @@
             this.rethrow(e, sql, params);
 
         } finally {
-            DbUtils.close(stmt);
+            close(stmt);
         }
 
         return rows;
@@ -465,7 +466,7 @@
         try {
             return this.update(conn, sql, params);
         } finally {
-            DbUtils.close(conn);
+            close(conn);
         }
     }
     
@@ -493,5 +494,25 @@
     protected ResultSet wrap(ResultSet rs) {
         return rs;
     }
-
+    
+	/**
+	 * Close a <code>Connection</code>, avoid closing if null.
+	 */
+	protected void close(Connection conn) throws SQLException {
+			DbUtils.close(conn);
+	}
+
+	/**
+	 * Close a <code>ResultSet</code>, avoid closing if null.
+	 */
+	protected void close(ResultSet rs) throws SQLException {
+			DbUtils.close(rs);
+	}
+
+	/**
+	 * Close a <code>Statement</code>, avoid closing if null.
+	 */
+	protected void close(Statement stmt) throws SQLException {
+			DbUtils.close(stmt);
+	}    
 }

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