You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2023/06/05 08:58:25 UTC

[plc4x] branch develop updated: fix(plc4go/eip): fix possible double match in switch

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git


The following commit(s) were added to refs/heads/develop by this push:
     new 096cb0ddf8 fix(plc4go/eip): fix possible double match in switch
096cb0ddf8 is described below

commit 096cb0ddf85ab07bacab34149c610f654d1adf15
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Mon Jun 5 10:58:16 2023 +0200

    fix(plc4go/eip): fix possible double match in switch
---
 plc4go/internal/eip/Reader.go | 4 ++--
 plc4go/internal/eip/Writer.go | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plc4go/internal/eip/Reader.go b/plc4go/internal/eip/Reader.go
index a38a0d2ce0..c2013b86c8 100644
--- a/plc4go/internal/eip/Reader.go
+++ b/plc4go/internal/eip/Reader.go
@@ -198,7 +198,7 @@ func (m *Reader) ToPlc4xReadResponse(response readWriteModel.CipService, readReq
 	plcValues := map[string]values.PlcValue{}
 	responseCodes := map[string]apiModel.PlcResponseCode{}
 	switch response := response.(type) {
-	case readWriteModel.CipReadResponse: // only 1 tag
+	case readWriteModel.CipReadResponseExactly: // only 1 tag
 		cipReadResponse := response
 		tagName := readRequest.GetTagNames()[0]
 		tag := readRequest.GetTag(tagName).(EIPPlcTag)
@@ -215,7 +215,7 @@ func (m *Reader) ToPlc4xReadResponse(response readWriteModel.CipService, readReq
 		}
 		plcValues[tagName] = plcValue
 		responseCodes[tagName] = code
-	case readWriteModel.MultipleServiceResponse: //Multiple response
+	case readWriteModel.MultipleServiceResponseExactly: //Multiple response
 		multipleServiceResponse := response
 		nb := multipleServiceResponse.GetServiceNb()
 		arr := make([]readWriteModel.CipService, nb)
diff --git a/plc4go/internal/eip/Writer.go b/plc4go/internal/eip/Writer.go
index b04eb3c61d..bd8c19235e 100644
--- a/plc4go/internal/eip/Writer.go
+++ b/plc4go/internal/eip/Writer.go
@@ -308,12 +308,12 @@ func encodeValue(value apiValues.PlcValue, _type readWriteModel.CIPDataTypeCode,
 func (m Writer) ToPlc4xWriteResponse(response readWriteModel.CipService, writeRequest apiModel.PlcWriteRequest) (apiModel.PlcWriteResponse, error) {
 	responseCodes := map[string]apiModel.PlcResponseCode{}
 	switch response := response.(type) {
-	case readWriteModel.CipWriteResponse: // only 1 tag
+	case readWriteModel.CipWriteResponseExactly: // only 1 tag
 		cipReadResponse := response
 		tagName := writeRequest.GetTagNames()[0]
 		code := decodeResponseCode(cipReadResponse.GetStatus())
 		responseCodes[tagName] = code
-	case readWriteModel.MultipleServiceResponse: //Multiple response
+	case readWriteModel.MultipleServiceResponseExactly: //Multiple response
 		/*		multipleServiceResponse := response
 						nb := multipleServiceResponse.GetServiceNb()
 						arr := make([]readWriteModel.CipService, nb)