Skip to content

Commit dd01138

Browse files
committed
Minor changes
1 parent e4e9a47 commit dd01138

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

Source/ROSIntegration/Private/Topic.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,7 @@ class UTopic::Impl {
101101
bson_t *bson_message = nullptr;
102102

103103
if (ConvertMessage(msg, &bson_message)) {
104-
return _ROSTopic->Publish(bson_message);
105-
//bson_destroy(bson_message); // Not necessary, since bson memory will be freed in the rosbridge core code
104+
return _ROSTopic->Publish(bson_message); // bson memory will be freed in the rosbridge core code after the message is published
106105
}
107106
else {
108107
UE_LOG(LogROS, Error, TEXT("Failed to ConvertMessage in UTopic::Publish()"));

Source/ROSIntegration/Private/rosbridge2cpp/ros_bridge.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,15 @@ namespace rosbridge2cpp {
7070
bool ROSBridge::SendMessage(ROSBridgeMsg &msg)
7171
{
7272
if (bson_only_mode()) {
73-
bson_t message = BSON_INITIALIZER;
74-
msg.ToBSON(message);
73+
bson_t* message = bson_new();
74+
msg.ToBSON(*message);
7575
//size_t offset;
7676

77-
const uint8_t *bson_data = bson_get_data(&message);
78-
uint32_t bson_size = message.len;
77+
const uint8_t *bson_data = bson_get_data(message);
78+
uint32_t bson_size = message->len;
7979
spinlock::scoped_lock_wait_for_short_task lock(transport_layer_access_mutex_);
8080
bool retval = transport_layer_.SendMessage(bson_data, bson_size);
81-
bson_destroy(&message); // TODO needed?
81+
bson_destroy(message);
8282
return retval;
8383

8484
// // going from JSON to BSON

0 commit comments

Comments
 (0)