wip

evcc-io · Oct 25, 2024 · 3977372 · 3977372
1 parent f9cd779
commit 3977372
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/charger/ocpp/cs.go b/charger/ocpp/cs.go
@@ -50,9 +50,12 @@ func (cs *CS) WithChargepointStatusByID(id string, fun func(status *core.StatusN
 	cs.mu.Lock()
 	defer cs.mu.Unlock()
 
-	state, ok := cs.cps[id]
-	if ok && state.status != nil {
-		fun(state.status)
+	if state, ok := cs.cps[id]; ok {
+		state.mu.Lock()
+		if state.status != nil {
+			fun(state.status)
+		}
+		state.mu.Unlock()
 	}
 }
 

diff --git a/charger/ocpp/cs_core.go b/charger/ocpp/cs_core.go
@@ -71,7 +71,9 @@ func (cs *CS) OnStatusNotification(id string, request *core.StatusNotificationRe
 
 	// cache status for future cp connection
 	if state, ok := cs.cps[id]; ok {
+		state.mu.Lock()
 		state.status = request
+		state.mu.Unlock()
 	}
 
 	return new(core.StatusNotificationConfirmation), nil