From ff49fc6d26acf68b00afaf40c41fe905f84ba3ac Mon Sep 17 00:00:00 2001
From: yasuda <yasuda@kyoto-sr.co.jp>
Date: Tue, 1 Oct 2024 15:47:59 +0900
Subject: [PATCH] Avoid null reference in responding to `TransactionEvent`
 without meter values

---
 OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs b/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs
index 43c0c58b..73287312 100644
--- a/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs
+++ b/OCPP.Core.Server/ControllerOCPP20.TransactionEvent.cs
@@ -129,7 +129,7 @@ public string HandleTransactionEvent(OCPPMessage msgIn, OCPPMessage msgOut)
                                 transaction.Uid = transactionEventRequest.TransactionInfo.TransactionId;
                                 transaction.ChargePointId = ChargePointStatus?.Id;
                                 transaction.ConnectorId = connectorId;
-                                transaction.StartTagId = ct.TagId;
+                                transaction.StartTagId = ct?.TagId;
                                 transaction.StartTime = transactionEventRequest.Timestamp.UtcDateTime;
                                 transaction.MeterStart = meterKWH;
                                 transaction.StartResult = transactionEventRequest.TriggerReason.ToString();
@@ -328,7 +328,7 @@ private void GetMeterValues(ICollection<MeterValueType> meterValues, out double
             meterTime = null;
             stateOfCharge = -1;
 
-            foreach (MeterValueType meterValue in meterValues)
+            foreach (MeterValueType meterValue in meterValues ?? [])
             {
                 foreach (SampledValueType sampleValue in meterValue.SampledValue)
                 {