Fixing bug in rosout teardown.

nburek · nburek · commit 810dc4e30645 · 2019-01-10T16:29:53.000-08:00
diff --git a/rcl/src/rcl/logging_rosout.c b/rcl/src/rcl/logging_rosout.c
@@ -116,10 +116,11 @@ rcl_ret_t rcl_logging_rosout_fini()
     status = rcl_publisher_fini(&entry.publisher, entry.node);
 
     if (RCL_RET_OK == status) {
-      const char * prev_key = key;
-      hashmap_ret = rcutils_hash_map_get_next_key_and_data(&__logger_map, NULL, &key, &entry);
+      RCL_RET_FROM_RCUTIL_RET(status, rcutils_hash_map_unset(&__logger_map, &key));
+    }
 
-      RCL_RET_FROM_RCUTIL_RET(status, rcutils_hash_map_unset(&__logger_map, &prev_key));
+    if (RCL_RET_OK == status) {
+      hashmap_ret = rcutils_hash_map_get_next_key_and_data(&__logger_map, NULL, &key, &entry);
     }
   }
   if (RCUTILS_RET_HASH_MAP_NO_MORE_ENTRIES != hashmap_ret) {

Original file line number	Diff line number	Diff line change
`@@ -116,10 +116,11 @@ rcl_ret_t rcl_logging_rosout_fini()`
`116`	`116`	`status = rcl_publisher_fini(&entry.publisher, entry.node);`
`117`	`117`
`118`	`118`	`if (RCL_RET_OK == status) {`
`119`		`- const char * prev_key = key;`
`120`		`- hashmap_ret = rcutils_hash_map_get_next_key_and_data(&__logger_map, NULL, &key, &entry);`
	`119`	`+ RCL_RET_FROM_RCUTIL_RET(status, rcutils_hash_map_unset(&__logger_map, &key));`
	`120`	`+ }`
`121`	`121`
`122`		`- RCL_RET_FROM_RCUTIL_RET(status, rcutils_hash_map_unset(&__logger_map, &prev_key));`
	`122`	`+ if (RCL_RET_OK == status) {`
	`123`	`+ hashmap_ret = rcutils_hash_map_get_next_key_and_data(&__logger_map, NULL, &key, &entry);`
`123`	`124`	`}`
`124`	`125`	`}`
`125`	`126`	`if (RCUTILS_RET_HASH_MAP_NO_MORE_ENTRIES != hashmap_ret) {`