Websocket is not stopping now, remove check that websocket needs to have a connection

Signed-off-by: Maaike Zijderveld <m.zijderveld@alfen.nl>

Author: maaikez

lib/ocpp/common/websocket/websocket_plain.cpp

@@ -257,16 +257,14 @@ void WebsocketPlain::close(websocketpp::close::status::value code, const std::st
     websocketpp::lib::error_code ec;
     this->cancel_reconnect_timer();
 
-    if (this->is_connected()) {
-        this->ws_client.stop_perpetual();
-        this->ws_client.close(this->handle, code, reason, ec);
-        if (ec) {
-            EVLOG_error << "Error initiating close of plain websocket: " << ec.message();
-            // on_close_plain won't be called here so we have to call the closed_callback manually
-            this->closed_callback(websocketpp::close::status::abnormal_close);
-        } else {
-            EVLOG_info << "Closed plain websocket successfully.";
-        }
+    this->ws_client.stop_perpetual();
+    this->ws_client.close(this->handle, code, reason, ec);
+    if (ec) {
+        EVLOG_error << "Error initiating close of plain websocket: " << ec.message();
+        // on_close_plain won't be called here so we have to call the closed_callback manually
+        this->closed_callback(websocketpp::close::status::abnormal_close);
+    } else {
+        EVLOG_info << "Closed plain websocket successfully.";
     }
 }
 

lib/ocpp/common/websocket/websocket_tls.cpp

@@ -445,17 +445,15 @@ void WebsocketTLS::close(websocketpp::close::status::value code, const std::stri
     websocketpp::lib::error_code ec;
     this->cancel_reconnect_timer();
 
-    if (this->is_connected()) {
-        this->wss_client.stop_perpetual();
-        this->wss_client.close(this->handle, code, reason, ec);
-
-        if (ec) {
-            EVLOG_error << "Error initiating close of TLS websocket: " << ec.message();
-            // on_close_tls wont be called here so we have to call the closed_callback manually
-            this->closed_callback(websocketpp::close::status::abnormal_close);
-        } else {
-            EVLOG_info << "Closed TLS websocket successfully.";
-        }
+    this->wss_client.stop_perpetual();
+    this->wss_client.close(this->handle, code, reason, ec);
+
+    if (ec) {
+        EVLOG_error << "Error initiating close of TLS websocket: " << ec.message();
+        // on_close_tls wont be called here so we have to call the closed_callback manually
+        this->closed_callback(websocketpp::close::status::abnormal_close);
+    } else {
+        EVLOG_info << "Closed TLS websocket successfully.";
     }
 }