[Cherry-pick] fix delete nil routine (#14951) (#15026)

Fix: delete nil routine Approved by: @daviszhen, @sukki37
matrixorigin · Mar 19, 2024 · 4c6cae1 · 4c6cae1
1 parent bd6febf
commit 4c6cae1
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/pkg/frontend/routine_manager.go b/pkg/frontend/routine_manager.go
@@ -198,14 +198,15 @@ func (rm *RoutineManager) deleteRoutine(rs goetty.IOSession) *Routine {
 	var ok bool
 	rm.mu.Lock()
 	defer rm.mu.Unlock()
-	rt, ok = rm.clients[rs]
-	if ok {
+	if rt, ok = rm.clients[rs]; ok {
 		delete(rm.clients, rs)
 	}
-	connID := rt.getConnectionID()
-	_, ok = rm.routinesByConnID[connID]
-	if ok {
-		delete(rm.routinesByConnID, connID)
+
+	if rt != nil {
+		connID := rt.getConnectionID()
+		if _, ok = rm.routinesByConnID[connID]; ok {
+			delete(rm.routinesByConnID, connID)
+		}
 	}
 	return rt
 }