Merge pull request #65 from ecmwf/feature/62-AxisRegistry-Develop

Copy DenseSet in IndexAxis.merge
ecmwf · Jan 14, 2025 · 1336a19 · 1336a19
2 parents 22e9a44 + 55cb18b
commit 1336a19
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/fdb5/database/IndexAxis.cc b/src/fdb5/database/IndexAxis.cc
@@ -406,7 +406,8 @@ void IndexAxis::merge(const fdb5::IndexAxis& other) {
 
         auto it = axis_.find(kv.first);
         if (it == axis_.end()) {
-            axis_.emplace(kv.first, kv.second);
+            /// @note: Have to make a copy, otherwise we risk modifying cached axes in the AxisRegistry.
+            axis_.emplace(kv.first, std::make_shared<eckit::DenseSet<std::string>>(*kv.second));
         } else {
             it->second->merge(*kv.second);
         };