AliceO2Group
diff --git a/‎CCDB/src/CCDBDownloader.cxx‎
Lines changed: 3 additions & 1 deletion b/‎CCDB/src/CCDBDownloader.cxx‎
Lines changed: 3 additions & 1 deletion
@@ -81,6 +81,9 @@ CCDBDownloader::~CCDBDownloader()
     uv_timer_stop(socketTimerPair.second);
     uv_close((uv_handle_t*)socketTimerPair.second, onUVClose);
   }
+  // all timers have been closed --> so clear this map (otherwise it may get accessed in different callbacks again
+  // ... for instance when called from within curl_multi_cleanup)
+  mSocketTimerMap.clear();
 
   // Close loop thread
   mCloseLoop = true;
@@ -172,7 +175,6 @@ void CCDBDownloader::closeSocketByTimer(uv_timer_t* handle)
     uv_timer_stop(CD->mSocketTimerMap[sock]);
     CD->mSocketTimerMap.erase(sock);
     close(sock);
-    return;
   }
 }
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,9 @@ CCDBDownloader::~CCDBDownloader()`
`81`	`81`	`uv_timer_stop(socketTimerPair.second);`
`82`	`82`	`uv_close((uv_handle_t*)socketTimerPair.second, onUVClose);`
`83`	`83`	`}`
	`84`	`+ // all timers have been closed --> so clear this map (otherwise it may get accessed in different callbacks again`
	`85`	`+ // ... for instance when called from within curl_multi_cleanup)`
	`86`	`+ mSocketTimerMap.clear();`
`84`	`87`
`85`	`88`	`// Close loop thread`
`86`	`89`	`mCloseLoop = true;`
`@@ -172,7 +175,6 @@ void CCDBDownloader::closeSocketByTimer(uv_timer_t* handle)`
`172`	`175`	`uv_timer_stop(CD->mSocketTimerMap[sock]);`
`173`	`176`	`CD->mSocketTimerMap.erase(sock);`
`174`	`177`	`close(sock);`
`175`		`- return;`
`176`	`178`	`}`
`177`	`179`	`}`
`178`	`180`