Merge pull request #163 from LoyVanBeek/fix/nested_sm_userdata

Fix nested state machine userdata
team-vigir · Apr 28, 2023 · d02963e · d02963e
2 parents 158f822 + 653dc7e
commit d02963e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/flexbe_core/src/flexbe_core/core/state_machine.py b/flexbe_core/src/flexbe_core/core/state_machine.py
@@ -75,7 +75,7 @@ def execute(self, userdata):
         if self._current_state is None:
             self.assert_consistent_transitions()
             self._current_state = self.initial_state
-            self._userdata = userdata or UserData()
+            self._userdata = userdata if userdata is not None else UserData()
             self._userdata(add_from=self._own_userdata)
         outcome = self._execute_current_state()
         return outcome

diff --git a/flexbe_core/src/flexbe_core/core/user_data.py b/flexbe_core/src/flexbe_core/core/user_data.py
@@ -65,7 +65,7 @@ def __setattr__(self, key, value):
         self[key] = value
 
     def __call__(self, reference=None, add_from=None, update_from=None, remove_key=None):
-        self._reference = reference or self._reference
+        self._reference = reference if reference is not None else self._reference
         if isinstance(add_from, UserData):
             for key, value in add_from._data.items():
                 if key not in self._data: