(shardingsphere) branch master updated: Refactor federation result set get current is called twice (#35759)

[duanzhengqiang]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 07e66230d98 Refactor federation result set get current is called twice 
(#35759)
07e66230d98 is described below

commit 07e66230d9822c847b0420ae96bbf75d772f3c4f
Author: ZhangCheng <chengzh...@apache.org>
AuthorDate: Fri Jun 20 12:55:00 2025 +0800

    Refactor federation result set get current is called twice (#35759)
---
 .../sqlfederation/resultset/SQLFederationResultSet.java              | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
 
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
index 151c95dbea2..4275ca35e49 100644
--- 
a/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
+++ 
b/kernel/sql-federation/core/src/main/java/org/apache/shardingsphere/sqlfederation/resultset/SQLFederationResultSet.java
@@ -100,8 +100,9 @@ public final class SQLFederationResultSet extends 
AbstractUnsupportedOperationSQ
     @Override
     public boolean next() {
         boolean result = enumerator.moveNext();
-        if (result && null != enumerator.current()) {
-            currentRows = getCurrentRows(enumerator.current());
+        if (result) {
+            Object current = enumerator.current();
+            currentRows = null == current ? new Object[]{null} : 
getCurrentRows(current);
         } else {
             currentRows = new Object[]{null};
         }