[service] Submit state clear event outside of lock

safing · Aug 28, 2024 · de4cb5b · de4cb5b
1 parent c6ddaf8
commit de4cb5b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/service/mgr/states.go b/service/mgr/states.go
@@ -149,11 +149,11 @@ func (m *StateMgr) Remove(id string) {
 // Clear removes all states.
 func (m *StateMgr) Clear() {
 	m.statesLock.Lock()
-	defer m.statesLock.Unlock()
-
 	m.states = nil
+	m.statesLock.Unlock()
 
-	m.statesEventMgr.Submit(m.export())
+	// Submit event without lock, because callbacks might come back to change states.
+	defer m.statesEventMgr.Submit(m.Export())
 }
 
 // Export returns the current states.