From b06c37780c08d74884aedc2de9937d2d22cce0cb Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Tue, 6 Jun 2023 14:36:36 +0200 Subject: [PATCH] Examples fix: delete topic after endpoint (#3558) (#3564) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Juan López Fernández (cherry picked from commit 5f2621cebca3d9ad0c14e146eb660b9c78878c61) # Conflicts: # examples/cpp/dds/AdvancedConfigurationExample/AdvancedConfigurationSubscriber.cpp Co-authored-by: juanlofer-eprosima <88179026+juanlofer-eprosima@users.noreply.github.com> --- .../BasicConfigurationSubscriber.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp b/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp index abe5111cc25..99007f6a626 100644 --- a/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp +++ b/examples/C++/DDS/BasicConfigurationExample/BasicConfigurationSubscriber.cpp @@ -172,10 +172,6 @@ HelloWorldSubscriber::~HelloWorldSubscriber() { if (participant_ != nullptr) { - if (topic_ != nullptr) - { - participant_->delete_topic(topic_); - } if (subscriber_ != nullptr) { if (reader_ != nullptr) @@ -184,6 +180,10 @@ HelloWorldSubscriber::~HelloWorldSubscriber() } participant_->delete_subscriber(subscriber_); } + if (topic_ != nullptr) + { + participant_->delete_topic(topic_); + } DomainParticipantFactory::get_instance()->delete_participant(participant_); } }