You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by no...@apache.org on 2022/04/21 11:34:59 UTC

[solr] branch branch_9x updated: Revert "SOLR-16119 DataConfigNode doesn't honor abortable forEach (#766)"

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

noble pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git


The following commit(s) were added to refs/heads/branch_9x by this push:
     new d797be8fb8d Revert "SOLR-16119 DataConfigNode doesn't honor abortable forEach (#766)"
d797be8fb8d is described below

commit d797be8fb8d8b9b1a3880284e3144350c3392360
Author: Noble Paul <no...@gmail.com>
AuthorDate: Thu Apr 21 21:34:45 2022 +1000

    Revert "SOLR-16119 DataConfigNode doesn't honor abortable forEach (#766)"
    
    This reverts commit f8fb7f440697ec0c37db331140da29708cf0de2e.
---
 solr/core/src/java/org/apache/solr/util/DataConfigNode.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/util/DataConfigNode.java b/solr/core/src/java/org/apache/solr/util/DataConfigNode.java
index f6d2880f43f..e8a00075031 100644
--- a/solr/core/src/java/org/apache/solr/util/DataConfigNode.java
+++ b/solr/core/src/java/org/apache/solr/util/DataConfigNode.java
@@ -129,9 +129,7 @@ public class DataConfigNode implements ConfigNode {
     kids.forEachEntry(
         (s, configNodes) -> {
           if (configNodes != null) {
-            for (ConfigNode node : configNodes) {
-              if (Boolean.FALSE == fun.apply(node)) break;
-            }
+            configNodes.forEach(fun::apply);
           }
         });
   }