delete associated dds_entity in DDScObjectDelegate.close (#505)

* delete associated dds_entity in DDScObjectDelegate.close Signed-off-by: Marcel Jordense <[email protected]> * close ObjectDelegate in destructor when it was not yet closed Signed-off-by: Marcel Jordense <[email protected]> --------- Signed-off-by: Marcel Jordense <[email protected]>
eclipse-cyclonedds · Aug 21, 2024 · 14f510d · 14f510d
1 parent 86eda0c
commit 14f510d
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/ddscxx/src/org/eclipse/cyclonedds/core/DDScObjectDelegate.cpp b/src/ddscxx/src/org/eclipse/cyclonedds/core/DDScObjectDelegate.cpp
@@ -30,17 +30,25 @@ org::eclipse::cyclonedds::core::DDScObjectDelegate::DDScObjectDelegate () :
 
 org::eclipse::cyclonedds::core::DDScObjectDelegate::~DDScObjectDelegate ()
 {
-    delete_from_entity_map();
+    if (!this->closed) {
+        try {
+            this->close();
+        } catch (...) {
 
-    if (this->ddsc_entity > 0) {
-        dds_delete(this->ddsc_entity);
-        this->ddsc_entity = 0;
+        }
     }
 }
 
 void
 org::eclipse::cyclonedds::core::DDScObjectDelegate::close ()
 {
+    delete_from_entity_map();
+
+    if (this->ddsc_entity > 0) {
+        dds_delete(this->ddsc_entity);
+        this->ddsc_entity = 0;
+    }
+
     org::eclipse::cyclonedds::core::ObjectDelegate::close();
 }