One-off bug

anno-gui/src/main/java/org/genesys2/anno/gui/PushDialog.java

@@ -204,7 +204,7 @@ public class PushDialog extends Dialog {
 							}
 
 							if (count % 100 == 0)
-								_log.info("Examining data at row " + count);
+								_log.debug("Examining data at row " + count);
 
 							for (Object[] row : rows) {
 								count++;

anno-gui/src/main/java/org/genesys2/anno/parser/JdbcRowReader.java

@@ -27,7 +27,6 @@ public class JdbcRowReader implements RowReader {
 
 	@Override
 	public List<Object[]> readRows(int rowsToRead) throws IOException {
-		List<Object[]> rows = new ArrayList<Object[]>(rowsToRead);
 		try {
 			if (this.preparedStatement == null) {
 				this.preparedStatement = conn.prepareStatement(query);
@@ -37,13 +36,16 @@ public class JdbcRowReader implements RowReader {
 				this.columnCount = metadata.getColumnCount();
 			}
 
-			while (res.next()) {
+			List<Object[]> rows = new ArrayList<Object[]>(rowsToRead);
+			int rowCount = 0;
+			while (res.next() && rowCount<rowsToRead) {
 				List<Object> row = new ArrayList<Object>();
-				for (int i = 1; i < columnCount; i++) {
+				for (int i = 1; i <= columnCount; i++) {
 					Object val = res.getObject(i);
 					row.add(val);
 				}
 				rows.add(row.toArray());
+				rowCount++;
 			}
 			return rows;