You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2014/02/26 15:51:04 UTC
svn commit: r1572068 -
/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
Author: markt
Date: Wed Feb 26 14:51:04 2014
New Revision: 1572068
URL: http://svn.apache.org/r1572068
Log:
Fix some unclosed resource warnings from FindBugs
Modified:
commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
Modified: commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java?rev=1572068&r1=1572067&r2=1572068&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java (original)
+++ commons/proper/dbcp/trunk/src/test/java/org/apache/commons/dbcp2/TestConnectionPool.java Wed Feb 26 14:51:04 2014
@@ -17,6 +17,7 @@
package org.apache.commons.dbcp2;
+import java.sql.CallableStatement;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -103,7 +104,8 @@ public abstract class TestConnectionPool
assertTrue(c[i] != null);
// generate SQLWarning on connection
- c[i].prepareCall("warning");
+ try (CallableStatement cs = c[i].prepareCall("warning")){
+ }
}
for (Connection element : c) {
@@ -360,8 +362,7 @@ public abstract class TestConnectionPool
stmt.close();
}
conn.close();
- try {
- conn.createStatement();
+ try (Statement s = conn.createStatement()){
fail("Can't use closed connections");
} catch(SQLException e) {
// expected
@@ -593,13 +594,10 @@ public abstract class TestConnectionPool
} catch(Exception e) {
// ignored
}
- Connection conn = null;
- PreparedStatement stmt = null;
- ResultSet rset = null;
- try {
- conn = newConnection();
- stmt = conn.prepareStatement("select 'literal', SYSDATE from dual");
- rset = stmt.executeQuery();
+ try (Connection conn = newConnection();
+ PreparedStatement stmt = conn.prepareStatement(
+ "select 'literal', SYSDATE from dual");
+ ResultSet rset = stmt.executeQuery();) {
try {
Thread.sleep(_random.nextInt(_delay));
} catch(Exception e) {
@@ -610,10 +608,6 @@ public abstract class TestConnectionPool
_failed = true;
_complete = true;
break;
- } finally {
- try { if (rset != null) rset.close(); } catch(Exception e) { }
- try { if (stmt != null) stmt.close(); } catch(Exception e) { }
- try { if (conn != null) conn.close(); } catch(Exception e) { }
}
}
_complete = true;