Author: markt Date: Thu Aug 4 09:35:16 2011 New Revision: 1153810 URL: http://svn.apache.org/viewvc?rev=1153810&view=rev Log: Generics
Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java?rev=1153810&r1=1153809&r2=1153810&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/PoolableCallableStatement.java Thu Aug 4 09:35:16 2011 @@ -114,9 +114,9 @@ public class PoolableCallableStatement e // ResultSet's when it is closed. // FIXME The PreparedStatement we're wrapping should handle this for us. // See DBCP-10 for what could happen when ResultSets are closed twice. - List resultSets = getTrace(); + List<AbandonedTrace> resultSets = getTrace(); if(resultSets != null) { - ResultSet[] set = (ResultSet[])resultSets.toArray(new ResultSet[resultSets.size()]); + ResultSet[] set = resultSets.toArray(new ResultSet[resultSets.size()]); for(int i = 0; i < set.length; i++) { set[i].close(); }