fix(plc4go/spi): avoid unnecessary read on DefaultCodec shutdown

apache · Jun 20, 2023 · fe99681 · fe99681
1 parent 8535bef
commit fe99681
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/plc4go/spi/default/DefaultCodec.go b/plc4go/spi/default/DefaultCodec.go
@@ -327,8 +327,12 @@ mainLoop:
 		{
 			syncer := make(chan struct{})
 			go func() {
+				defer close(syncer)
+				if !m.running.Load() {
+					err = errors.New("not running")
+					return
+				}
 				message, err = m.Receive()
-				close(syncer)
 			}()
 			timeoutTimer := time.NewTimer(m.receiveTimeout)
 			select {
@@ -339,7 +343,6 @@ mainLoop:
 				workerLog.Error().Msgf("receive timeout after %s", m.receiveTimeout)
 				continue mainLoop
 			}
-
 		}
 		if err != nil {
 			workerLog.Error().Err(err).Msg("got an error reading from transport")

diff --git a/plc4go/spi/transports/TransportInstance.go b/plc4go/spi/transports/TransportInstance.go
@@ -22,13 +22,14 @@ package transports
 import (
 	"context"
 	"fmt"
+	"io"
 )
 
 type TransportInstance interface {
 	fmt.Stringer
+	io.Closer
 	Connect() error
 	ConnectWithContext(ctx context.Context) error
-	Close() error
 
 	IsConnected() bool