Merge pull request cyclus#1806 from nuclearkatie/packaging

ResTracker Extract gave the wrong parent_id to one of the child resources
abachma2 · Sep 24, 2024 · bde9307 · bde9307
2 parents 6ac62fb + 8b3f1e2
commit bde9307
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -38,6 +38,7 @@ Since last release
 * Removed GTest source code from code coverage reports (#1759)
 * Updated action versions to avoid node.js deprecation (#1802)
 * Removed the module imports in `cyclus/__init__.py` and removed the need for multi-phase initialization of Cython modules (#1809)
+* ResTracker Extract gave the wrong parent_id to one of the child resources (#1806)
 
 
 v1.6.0

diff --git a/src/res_tracker.cc b/src/res_tracker.cc
@@ -49,15 +49,19 @@ void ResTracker::Extract(ResTracker* removed) {
   if (res_->quantity() > eps_rsrc()) {
     parent1_ = res_->state_id();
     parent2_ = 0;
-
-    Record();
   }
 
+  // removed parent must be set before the resource is recorded, otherwise
+  // removed ends up with parent1 of the other child (which is this resource
+  // after being bumped)
   removed->parent1_ = res_->state_id();
   removed->parent2_ = 0;
   removed->tracked_ = tracked_;
-
   removed->Record();
+
+  if (res_->quantity() > eps_rsrc()) {
+    Record();
+  }
 }
 
 void ResTracker::Absorb(ResTracker* absorbed) {