aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorinnokentii <innokentii@yandex-team.com>2023-09-20 00:37:34 +0300
committerinnokentii <innokentii@yandex-team.com>2023-09-20 00:58:34 +0300
commitee3d0032daf776f72d2888ff438814ea6869e612 (patch)
treef7bd1746e83bd7c6aa316613815b7587e3e4eb89
parent38d353cb704b884242efe1e8f0d34d2420de4488 (diff)
downloadydb-ee3d0032daf776f72d2888ff438814ea6869e612.tar.gz
Fix converter behavior for overwrite
fix converter
-rw-r--r--ydb/library/yaml_config/console_dumper.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/ydb/library/yaml_config/console_dumper.cpp b/ydb/library/yaml_config/console_dumper.cpp
index 24c0460f68..2ca188302b 100644
--- a/ydb/library/yaml_config/console_dumper.cpp
+++ b/ydb/library/yaml_config/console_dumper.cpp
@@ -468,7 +468,7 @@ bool CheckYamlMarkedForMergeOverwriteRepeated(NFyaml::TNodeRef &node) {
return false;
}
} else if (value.Type() == NFyaml::ENodeType::Sequence) {
- if (value.Tag() != "") {
+ if (value.Tag() && value.Tag() != "") {
return false;
}
}
@@ -501,11 +501,14 @@ bool CheckYamlMarkedForOverwrite(NFyaml::TNodeRef &node) {
for (auto &child : rootMap) {
auto value = child.Value();
if (value.Type() == NFyaml::ENodeType::Mapping) {
- if (value.Tag() != "") {
+ if (value.Tag() && value.Tag() != "") {
+ return false;
+ }
+ if (!CheckYamlMarkedForOverwrite(value)) {
return false;
}
} else if (value.Type() == NFyaml::ENodeType::Sequence) {
- if (value.Tag() != "") {
+ if (value.Tag() && value.Tag() != "") {
return false;
}
}