commit 4b1e1445b502fe6012de5e20562ee38f4b6649b0
author Alexei Strots <alexei.strots@bluerivertech.com> Mon May 01 22:11:05 2023 -0700
committer James Kuszmaul <jabukuszmaul+collab@gmail.com> Fri Jul 21 08:12:56 2023 -0700
tree f9922d8a0cd23d5b6b97722088fba3c69046be52
parent 58017403e42c9636324f18569cfaffa32626f0d2

Support empty node name for single node system.

Change-Id: I268c324a800e9faabc008ad694b534c1bf7687fc
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/configuration.cc

diff --git a/aos/configuration.cc b/aos/configuration.cc
index ca11348..aa69d99 100644
--- a/aos/configuration.cc
+++ b/aos/configuration.cc
@@ -1155,8 +1155,12 @@
 }
 
 const Node *GetNode(const Configuration *config, std::string_view name) {
-  CHECK(config->has_nodes())
-      << ": Asking for a node from a single node configuration.";
+  if (!MultiNode(config)) {
+    if (name.empty()) {
+      return nullptr;
+    }
+    LOG(FATAL) << ": Asking for a named node from a single node configuration.";
+  }
   for (const Node *node : *config->nodes()) {
     CHECK(node->has_name()) << ": Malformed node " << FlatbufferToJson(node);
     if (node->name()->string_view() == name) {