You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by mp...@apache.org on 2025/09/17 12:03:35 UTC

(ignite-3) 01/01: IGNITE-26445 Filter null order keys in case of configuration subtree

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

mpochatkin pushed a commit to branch IGNITE-26445
in repository https://gitbox.apache.org/repos/asf/ignite-3.git

commit 36eee023e1fbd6a42e6b1fa39e4e338302121cf4
Author: Pochatkin Mikhail <m....@gmail.com>
AuthorDate: Wed Sep 17 15:02:57 2025 +0300

    IGNITE-26445 Filter null order keys in case of configuration subtree
---
 .../apache/ignite/internal/configuration/util/ConfigurationUtil.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/util/ConfigurationUtil.java b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/util/ConfigurationUtil.java
index 7e463413ecf..941aae510f7 100644
--- a/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/util/ConfigurationUtil.java
+++ b/modules/configuration/src/main/java/org/apache/ignite/internal/configuration/util/ConfigurationUtil.java
@@ -40,6 +40,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.Queue;
 import java.util.RandomAccess;
 import java.util.Set;
@@ -1201,6 +1202,7 @@ public class ConfigurationUtil {
                     node.construct(oldKey, new LeafConfigurationSource((Serializable) val), true);
                 }
             }
+            orderedKeys.removeIf(Objects::isNull);
 
             node.reorderKeys(orderedKeys.size() > node.size()
                     ? orderedKeys.subList(0, node.size())