Fix concurrent map write due to read lock and delete (#3457)

Fix concurrent map write due to read lock and delete (#3457) #99