(cayenne) branch master updated: CAY-2814 Select query iterator() and batchIterator() methods return incorrect results - fix iterator check

[ntimofeev]

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

ntimofeev pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git


The following commit(s) were added to refs/heads/master by this push:
     new 24dfa6a56 CAY-2814 Select query iterator() and batchIterator() methods 
return incorrect results  - fix iterator check
24dfa6a56 is described below

commit 24dfa6a561896ad45680fa7a4d68b2f6d4db803d
Author: stariy95 <stari...@gmail.com>
AuthorDate: Wed Nov 8 16:29:06 2023 +0400

    CAY-2814 Select query iterator() and batchIterator() methods return 
incorrect results
     - fix iterator check
---
 .../src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
 
b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
index 235f42427..d13f06138 100644
--- 
a/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
+++ 
b/cayenne-server/src/main/java/org/apache/cayenne/access/DataDomainQueryAction.java
@@ -574,7 +574,8 @@ class DataDomainQueryAction implements QueryRouter, 
OperationObserver {
     private void interceptObjectConversion() {
         if (context != null) {
             ObjectConversionStrategy<?,?> converter = getConverter();
-            if (response.isIterator()) {
+            ResultIterator<?> iterator = response.firstIterator();
+            if (iterator != null) {
                 wrapResponseIteratorWithConverterDecorator(converter);
             } else {
                 List mainRows = response.firstList(); // List<DataRow> or 
List<Object[]>