(commons-dbutils) branch master updated: org.apache.commons.dbutils.ResultSetIterator.next() now throws NoSuchElementException as defined in java.util.Iterator.next()

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-dbutils.git


The following commit(s) were added to refs/heads/master by this push:
     new f3a3520  org.apache.commons.dbutils.ResultSetIterator.next() now 
throws NoSuchElementException as defined in java.util.Iterator.next()
f3a3520 is described below

commit f3a352066db4792235e8e5e6ba60673474bfc067
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Mon Jan 5 08:02:36 2026 -0500

    org.apache.commons.dbutils.ResultSetIterator.next() now throws
    NoSuchElementException as defined in java.util.Iterator.next()
    
    See also PR #283
---
 src/main/java/org/apache/commons/dbutils/ResultSetIterator.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java 
b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
index 35c6d1f..e5b9758 100644
--- a/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
+++ b/src/main/java/org/apache/commons/dbutils/ResultSetIterator.java
@@ -106,8 +106,10 @@ public class ResultSetIterator implements 
Iterator<Object[]> {
     public Object[] next() {
         if (hasNext()) {
             try {
-                resultSet.next();
-                return this.convert.toArray(resultSet);
+                if (resultSet.next()) {
+                    return convert.toArray(resultSet);
+                }
+                throw new NoSuchElementException("No more rows in the 
ResultSet");
             } catch (final SQLException e) {
                 rethrow(e);
                 return null;