From f593443171d043c093567281a27b9ec2ddfe09a6 Mon Sep 17 00:00:00 2001 From: Thomas Moulard Date: Sat, 1 Dec 2018 23:13:23 -0800 Subject: [PATCH] Stop locking twice in on_data_available --- rmw_opensplice_cpp/src/types.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/rmw_opensplice_cpp/src/types.cpp b/rmw_opensplice_cpp/src/types.cpp index f63d6ed6..8ac6323f 100644 --- a/rmw_opensplice_cpp/src/types.cpp +++ b/rmw_opensplice_cpp/src/types.cpp @@ -227,7 +227,6 @@ CustomPublisherListener::on_data_available(DDS::DataReader * reader) GuidPrefix_t guid; DDS_BuiltinTopicKey_to_GUID(&guid, data_seq[i].key); if (info_seq[i].instance_state == DDS::ALIVE_INSTANCE_STATE) { - std::lock_guard lock(mutex_); topic_name = data_seq[i].topic_name.in(); topic_cache.addTopic(guid, topic_name, data_seq[i].type_name.in()); print_discovery_logging("+", topic_name, data_seq[i].type_name.in(), PublisherEP); @@ -281,7 +280,6 @@ CustomSubscriberListener::on_data_available(DDS::DataReader * reader) if (info_seq[i].valid_data) { GuidPrefix_t guid; DDS_BuiltinTopicKey_to_GUID(&guid, data_seq[i].key); - std::lock_guard lock(mutex_); if (info_seq[i].instance_state == DDS::ALIVE_INSTANCE_STATE) { topic_name = data_seq[i].topic_name.in(); topic_cache.addTopic(guid, topic_name, data_seq[i].type_name.in());