From 9788955003d576ebd4b241f4ee04936836a07b1d Mon Sep 17 00:00:00 2001
From: Jesse Kerkhoven <git@prive.jkerkhoven.nl>
Date: Mon, 18 Oct 2021 15:07:30 +0200
Subject: [PATCH] Fix: Terminate session after Metering Receipt when requesting
 STOP Charging. Fixes #66

---
 .../risev2g/evcc/states/WaitForMeteringReceiptRes.java     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java
index 39d0038..eaa9626 100644
--- a/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java
+++ b/RISE-V2G-EVCC/src/main/java/com/v2gclarity/risev2g/evcc/states/WaitForMeteringReceiptRes.java
@@ -99,6 +99,13 @@ public class WaitForMeteringReceiptRes extends ClientState {
 						return getSendMessage(getCurrentDemandReq(), V2GMessages.CURRENT_DEMAND_RES);
 					}
 				} else {
+					/* Check if the EV controller triggered a pause of a charging session. 
+					 * If not, indicate a termination of the charging session. This will be
+					 * evaluated in the state WaitForPowerDeliveryRes
+					 */
+					if (getCommSessionContext().getChargingSession() == null)
+						getCommSessionContext().setChargingSession(ChargingSessionType.TERMINATE);
+					
 					return getSendMessage(getPowerDeliveryReq(ChargeProgressType.STOP), 
 										  V2GMessages.POWER_DELIVERY_RES,
 										  " (ChargeProgress = STOP_CHARGING)");