refactor(*): fix merge problems

grid-x · Mar 5, 2024 · add4e73 · add4e73
1 parent ae287d7
commit add4e73
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ocpp1.6/types/types.go b/ocpp1.6/types/types.go
@@ -2,8 +2,9 @@
 package types
 
 import (
-	"github.com/lorenzodonini/ocpp-go/ocppj"
 	"gopkg.in/go-playground/validator.v9"
+
+	"github.com/lorenzodonini/ocpp-go/ocppj"
 )
 
 const (

diff --git a/ocppj/server.go b/ocppj/server.go
@@ -244,7 +244,7 @@ func (s *Server) ocppMessageHandler(wsChannel ws.Channel, data []byte) error {
 		log.Error(err)
 		return err
 	}
-	log.Debugf("received JSON message from %s: %s", wsChannel.ID(), string(data))
+
 	// Get pending requests for client
 	pending := s.RequestState.GetClientState(wsChannel.ID())
 	message, err := s.ParseMessage(parsedJson, pending)

diff --git a/ws/websocket.go b/ws/websocket.go
@@ -19,6 +19,7 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/gorilla/websocket"
+
 	"github.com/lorenzodonini/ocpp-go/logging"
 )
 
@@ -1015,9 +1016,7 @@ func (client *Client) IsConnected() bool {
 }
 
 func (client *Client) Write(data []byte) error {
-	client.mutex.Lock()
-	defer client.mutex.Unlock()
-	if !client.connected {
+	if !client.IsConnected() {
 		return fmt.Errorf("client is currently not connected, cannot send data")
 	}
 	log.Debugf("queuing data for server")