From 07561812b72072b6d9f20997be86a42ee88e15a2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Thu, 15 Sep 2022 10:40:40 +0200
Subject: [PATCH] Fix error handling at OCPP message sending
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 src/charging-station/ocpp/OCPPRequestService.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/charging-station/ocpp/OCPPRequestService.ts b/src/charging-station/ocpp/OCPPRequestService.ts
index 653679e9..921945e8 100644
--- a/src/charging-station/ocpp/OCPPRequestService.ts
+++ b/src/charging-station/ocpp/OCPPRequestService.ts
@@ -71,7 +71,7 @@ export default abstract class OCPPRequestService {
       );
     } catch (error) {
       this.handleSendMessageError(chargingStation, commandName, error as Error, {
-        throwError: false,
+        throwError: true,
       });
     }
   }
@@ -116,9 +116,7 @@ export default abstract class OCPPRequestService {
         params
       );
     } catch (error) {
-      this.handleSendMessageError(chargingStation, commandName, error as Error, {
-        throwError: false,
-      });
+      this.handleSendMessageError(chargingStation, commandName, error as Error);
     }
   }
 
@@ -364,10 +362,10 @@ export default abstract class OCPPRequestService {
     chargingStation: ChargingStation,
     commandName: RequestCommand | IncomingRequestCommand,
     error: Error,
-    params: HandleErrorParams<EmptyObject> = { throwError: true }
+    params: HandleErrorParams<EmptyObject> = { throwError: false }
   ): void {
     logger.error(`${chargingStation.logPrefix()} Request command '${commandName}' error:`, error);
-    if (params?.throwError) {
+    if (params?.throwError === true) {
       throw error;
     }
   }
-- 
2.34.1