Reverted r1481176 changes for ArrayHandler git-svn-id: https://svn.apache.org/repos/asf/commons/proper/dbutils/branches/2_0@1482404 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/8914548f Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/8914548f Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/8914548f Branch: refs/heads/2_0 Commit: 8914548f5c201e1865e0eb63a204b3ecc0edd8a4 Parents: f2fba8d Author: Bill Speirs <[email protected]> Authored: Tue May 14 15:39:27 2013 +0000 Committer: Bill Speirs <[email protected]> Committed: Tue May 14 15:39:27 2013 +0000 ---------------------------------------------------------------------- .../apache/commons/dbutils2/handlers/ArrayHandler.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/8914548f/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java b/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java index 5eef4ba..3ad73c1 100644 --- a/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java +++ b/src/main/java/org/apache/commons/dbutils2/handlers/ArrayHandler.java @@ -25,12 +25,12 @@ import org.apache.commons.dbutils2.RowProcessor; /** * <code>ResultSetHandler</code> implementation that converts a - * <code>ResultSet</code> into an <code>T[]</code>. This class is + * <code>ResultSet</code> into an <code>Object[]</code>. This class is * thread safe. * * @see org.apache.commons.dbutils2.ResultSetHandler */ -public class ArrayHandler<T> implements ResultSetHandler<T[]> { +public class ArrayHandler implements ResultSetHandler<Object[]> { /** * Singleton processor instance that handlers share to save memory. Notice @@ -65,18 +65,18 @@ public class ArrayHandler<T> implements ResultSetHandler<T[]> { } /** - * Places the column values from the first row in an <code>T[]</code>. + * Places the column values from the first row in an <code>Object[]</code>. * * @param rs <code>ResultSet</code> to process. - * @return An T[] or <code>null</code> if there are no rows in the + * @return An Object[] or <code>null</code> if there are no rows in the * <code>ResultSet</code>. * * @throws SQLException if a database access error occurs * @see org.apache.commons.dbutils2.ResultSetHandler#handle(java.sql.ResultSet) */ @Override - public T[] handle(ResultSet rs) throws SQLException { - return (T[]) (rs.next() ? this.convert.toArray(rs) : null); + public Object[] handle(ResultSet rs) throws SQLException { + return rs.next() ? this.convert.toArray(rs) : null; } }
