[ofbiz-framework] branch trunk updated: Improved: Search/find in web tools - entity-engine generates an error (OFBIZ-12422)

[jleroux]

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

jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 23177b1  Improved: Search/find in web tools - entity-engine generates 
an error (OFBIZ-12422)
23177b1 is described below

commit 23177b182dd8cad0f7a8b76905e229815c05e1be
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Nov 30 10:37:35 2021 +0100

    Improved: Search/find in web tools - entity-engine generates an error 
(OFBIZ-12422)
    
    I blindly followed SpotBugs advice, using a "try with resource" because the
    EntityListIterator was not closed. Forgetting that it's done by purpose.
    
    Thanks: Thanks Pierre Smits for report
---
 .../java/org/apache/ofbiz/widget/renderer/FormRenderer.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
index eaf2615..7d68b34 100644
--- 
a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
+++ 
b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/FormRenderer.java
@@ -1232,7 +1232,8 @@ public class FormRenderer {
         }
         int itemIndex = -1;
         if (iter instanceof EntityListIterator) {
-            try (EntityListIterator eli = (EntityListIterator) iter) {
+            EntityListIterator eli = (EntityListIterator) iter;
+            try {
                 if (eli.getResultsSizeAfterPartialList() > 0) {
                     itemIndex++;
                 }
@@ -1240,11 +1241,9 @@ public class FormRenderer {
                 Debug.logError(gee, MODULE);
             }
         } else {
-            if (iter != null) {
-                while (iter.hasNext()) {
-                    itemIndex++;
-                    break;
-                }
+            while (iter.hasNext()) {
+                itemIndex++;
+                break;
             }
         }
         if (itemIndex < 0) {