Index: OptimalBeanListHandler.java
===================================================================
--- OptimalBeanListHandler.java	(revision 536476)
+++ OptimalBeanListHandler.java	(working copy)
@@ -19,6 +19,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
+import org.apache.commons.dbutils.ResultSetHandler;
 import org.apache.commons.dbutils.RowProcessor;
 
 /**
@@ -28,7 +29,7 @@
  * 
  * @see org.apache.commons.dbutils.ResultSetHandler
  */
-public class BeanListHandler extends GenericListHandler {
+public class OptimalBeanListHandler implements ResultSetHandler {
 
     /**
      * The Class of beans produced by this handler.
@@ -47,7 +48,7 @@
      * @param type The Class that objects returned from <code>handle()</code>
      * are created from.
      */
-    public BeanListHandler(Class type) {
+    public OptimalBeanListHandler(Class type) {
         this.type = type;
     }
 
@@ -59,22 +60,23 @@
      * @param convert The <code>RowProcessor</code> implementation 
      * to use when converting rows into beans.
      */
-    public BeanListHandler(Class type, RowProcessor convert) {
+    public OptimalBeanListHandler(Class type, RowProcessor convert) {
         this.type = type;
         this.convert = convert;
     }
 
     /**
-     * Convert the <code>ResultSet</code> row into a bean with
+     * Convert the whole <code>ResultSet</code> into a List of beans with
      * the <code>Class</code> given in the constructor.
      * 
-     * @return A bean, never <code>null</code>.
+     * @param rs The <code>ResultSet</code> to handle.
      * 
+     * @return A List of beans, never <code>null</code>.
+     * 
      * @throws SQLException if a database access error occurs
-     * @see org.apache.commons.dbutils.handlers.GenericListHandler#handle(ResultSet)
+     * @see org.apache.commons.dbutils.RowProcessor#toBeanList(ResultSet, Class)
      */
-    protected Object handleRow(ResultSet rs) throws SQLException {
-        return this.convert.toBean(rs, type);
+    public Object handle(ResultSet rs) throws SQLException {
+        return this.convert.toBeanList(rs, type);
     }
-
 }