fix merge conflict

NVIDIA · Apr 8, 2024 · 1046f93 · 1046f93
1 parent be0b941
commit 1046f93
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/nvflare/app_common/workflows/model_controller.py b/nvflare/app_common/workflows/model_controller.py
@@ -90,11 +90,9 @@ def start_controller(self, fl_ctx: FLContext) -> None:
 
     def _build_shareable(self, data: FLModel = None) -> Shareable:
         data_shareable: Shareable = FLModelUtils.to_shareable(data)
-        if not data_shareable.get_header(AppConstants.CURRENT_ROUND):
-            data_shareable.set_header(AppConstants.CURRENT_ROUND, self._current_round)
-        if not data_shareable.get_header(AppConstants.NUM_ROUNDS):
-            data_shareable.set_header(AppConstants.NUM_ROUNDS, self._num_rounds)
-        data_shareable.add_cookie(AppConstants.CONTRIBUTION_ROUND, self._current_round)
+        data_shareable.add_cookie(
+            AppConstants.CONTRIBUTION_ROUND, data_shareable.get_header(AppConstants.CURRENT_ROUND)
+        )
 
         return data_shareable