Skip to content

Commit

Permalink
Fix ros2#894
Browse files Browse the repository at this point in the history
Signed-off-by: Markus Hofstaetter <markus.hofstaetter@ait.ac.at>
  • Loading branch information
devrite committed Jun 7, 2023
1 parent 2e05e00 commit 9f52c08
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions rclpy/rclpy/node.py
Expand Up @@ -453,6 +453,11 @@ def declare_parameters(
# Get the values from the tuple, checking its types.
# Use defaults if the tuple doesn't contain value and / or descriptor.
name = parameter_tuple[0]
if namespace:
name = f'{namespace}.{name}'

# Note(jubeira): declare_parameters verifies the name, but set_parameters doesn't.
validate_parameter_name(name)
second_arg = parameter_tuple[1] if 1 < len(parameter_tuple) else None
descriptor = parameter_tuple[2] if 2 < len(parameter_tuple) else ParameterDescriptor()

Expand Down Expand Up @@ -503,12 +508,6 @@ def declare_parameters(
if not ignore_override and name in self._parameter_overrides:
value = self._parameter_overrides[name].value

if namespace:
name = f'{namespace}.{name}'

# Note(jubeira): declare_parameters verifies the name, but set_parameters doesn't.
validate_parameter_name(name)

parameter_list.append(Parameter(name, value=value))
descriptors.update({name: descriptor})

Expand Down

0 comments on commit 9f52c08

Please sign in to comment.