Moving the erase from destructors to take place after the actual dest…

…ruction but still within the lock (#1541)
rdkcentral · Mar 8, 2024 · 68fa80d · 68fa80d
1 parent 47972cf
commit 68fa80d
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/Source/com/Communicator.cpp b/Source/com/Communicator.cpp
@@ -141,7 +141,6 @@ namespace RPC {
 
             if (index != _destructors.end()) {
                 handler = index->second;
-                _destructors.erase(index);
             }
 
             _adminLock.Unlock();
@@ -152,6 +151,16 @@ namespace RPC {
                 handler->Destruct();
                 handler->Release();
             }
+
+            _adminLock.Lock();
+
+            index = _destructors.find(id);
+
+            if (index != _destructors.end()) {
+                _destructors.erase(index);
+            }
+
+            _adminLock.Unlock();
         }
         void Destruct(const uint32_t id, Communicator::MonitorableProcess& entry)
         {