From 320accf19f3b0bf0a2ed683df32311a123650760 Mon Sep 17 00:00:00 2001 From: Jeremie Deray Date: Thu, 12 Apr 2018 15:57:39 +0200 Subject: [PATCH 1/2] Fix #47 Do not print error message while retrieving param with default value. --- include/rosparam_handler/utilities.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/rosparam_handler/utilities.hpp b/include/rosparam_handler/utilities.hpp index 21ae708..6adc9ca 100644 --- a/include/rosparam_handler/utilities.hpp +++ b/include/rosparam_handler/utilities.hpp @@ -151,10 +151,10 @@ inline bool getParam(const std::string key, T& val) { /// \param defaultValue Parameter default value template inline bool getParam(const std::string key, T& val, const T& defaultValue) { - if (!getParam(key, val)) { + if (!ros::param::has(key) && !ros::param::get(key, val)) { val = defaultValue; ros::param::set(key, defaultValue); - ROS_INFO_STREAM("Setting default value."); + ROS_INFO_STREAM("Setting default value for parameter '" << key << "'."); return true; } else { // Param was already retrieved with last if statement. From 089ea605b987972b52e6fab7660ab755c3170dad Mon Sep 17 00:00:00 2001 From: Jeremie Deray Date: Thu, 12 Apr 2018 16:31:44 +0200 Subject: [PATCH 2/2] Fix #47 --- include/rosparam_handler/utilities.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rosparam_handler/utilities.hpp b/include/rosparam_handler/utilities.hpp index 6adc9ca..48d4ae9 100644 --- a/include/rosparam_handler/utilities.hpp +++ b/include/rosparam_handler/utilities.hpp @@ -151,7 +151,7 @@ inline bool getParam(const std::string key, T& val) { /// \param defaultValue Parameter default value template inline bool getParam(const std::string key, T& val, const T& defaultValue) { - if (!ros::param::has(key) && !ros::param::get(key, val)) { + if (!ros::param::has(key) || !ros::param::get(key, val)) { val = defaultValue; ros::param::set(key, defaultValue); ROS_INFO_STREAM("Setting default value for parameter '" << key << "'.");