From 3b6fb8006c22b127e0085dacba4e0895be4543fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Hern=C3=A1ndez=20Cordero?= <ahcorde@gmail.com>
Date: Mon, 9 Dec 2024 11:43:43 +0100
Subject: [PATCH] clean merge
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
---
 rmw_zenoh_cpp/src/detail/rmw_client_data.cpp | 1 +
 rmw_zenoh_cpp/src/rmw_zenoh.cpp              | 1 +
 2 files changed, 2 insertions(+)

diff --git a/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp b/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
index 4e8dfaae..a95c98a2 100644
--- a/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
+++ b/rmw_zenoh_cpp/src/detail/rmw_client_data.cpp
@@ -269,6 +269,7 @@ bool ClientData::init(const z_loaned_session_t * session)
   initialized_ = true;
 
   free_ros_keyexpr.cancel();
+  free_token.cancel();
 
   return true;
 }
diff --git a/rmw_zenoh_cpp/src/rmw_zenoh.cpp b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
index b7784920..1e13a710 100644
--- a/rmw_zenoh_cpp/src/rmw_zenoh.cpp
+++ b/rmw_zenoh_cpp/src/rmw_zenoh.cpp
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 #include <fastcdr/FastBuffer.h>
+
 #include <zenoh.h>
 
 #include <chrono>