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 2022/08/08 09:10:45 UTC
[plc4x] 01/03: fix(spi): WriteBufferBoxBased should not switch out writer for sub
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
commit 35c2e26940a126bdc94c7e5f343a7e601fe4443e
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Mon Aug 8 10:50:19 2022 +0200
fix(spi): WriteBufferBoxBased should not switch out writer for sub
The TLP box is in the right boxing anyway. So this avoids totally messed up sub boxes
---
plc4go/internal/spi/utils/WriteBufferBoxBased.go | 1 -
.../java/org/apache/plc4x/java/spi/generation/WriteBufferBoxBased.java | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/plc4go/internal/spi/utils/WriteBufferBoxBased.go b/plc4go/internal/spi/utils/WriteBufferBoxBased.go
index 80e1a2d36..14b579440 100644
--- a/plc4go/internal/spi/utils/WriteBufferBoxBased.go
+++ b/plc4go/internal/spi/utils/WriteBufferBoxBased.go
@@ -223,7 +223,6 @@ func (b *boxedWriteBuffer) WriteVirtual(logicalName string, value interface{}, w
asciiBox = b.asciiBoxWriterLight.BoxString(logicalName, fmt.Sprintf("%x %f%s", value, value, additionalStringRepresentation), 0)
case Serializable:
virtualBoxedWriteBuffer := NewBoxedWriteBuffer()
- virtualBoxedWriteBuffer.(*boxedWriteBuffer).asciiBoxWriter = AsciiBoxWriterLight
if err := value.(Serializable).Serialize(virtualBoxedWriteBuffer); err == nil {
asciiBox = b.asciiBoxWriterLight.BoxBox(logicalName, virtualBoxedWriteBuffer.GetBox(), 0)
} else {
diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferBoxBased.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferBoxBased.java
index 397a93406..96a5e9d1b 100644
--- a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferBoxBased.java
+++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/generation/WriteBufferBoxBased.java
@@ -228,7 +228,7 @@ public class WriteBufferBoxBased implements WriteBuffer, BufferCommons {
} else if (value instanceof Serializable) {
Serializable serializable = (Serializable) value;
try {
- WriteBufferBoxBased writeBuffer = new WriteBufferBoxBased(asciiBoxWriterLight, asciiBoxWriterLight, true, true);
+ WriteBufferBoxBased writeBuffer = new WriteBufferBoxBased(true, true);
serializable.serialize(writeBuffer);
virtualBox = asciiBoxWriterLight.boxBox(logicalName, writeBuffer.getBox(), 0);
} catch (SerializationException e) {