fix(plc4go): fixed NPE when trying to print the SubscriptionResponse

apache · Aug 19, 2022 · 84fb3f2 · 84fb3f2
1 parent 4ca9925
commit 84fb3f2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 14 deletions.
diff --git a/plc4go/internal/cbus/Field.go b/plc4go/internal/cbus/Field.go
@@ -540,9 +540,12 @@ func (s salMonitorField) Serialize(writeBuffer utils.WriteBuffer) error {
 		return err
 	}
 
-	if err := s.unitAddress.Serialize(writeBuffer); err != nil {
-		return err
+	if unitAddress := s.unitAddress; unitAddress != nil {
+		if err := unitAddress.Serialize(writeBuffer); err != nil {
+			return err
+		}
 	}
+
 	if err := s.application.Serialize(writeBuffer); err != nil {
 		return err
 	}
@@ -587,8 +590,10 @@ func (m mmiMonitorField) Serialize(writeBuffer utils.WriteBuffer) error {
 		return err
 	}
 
-	if err := m.unitAddress.Serialize(writeBuffer); err != nil {
-		return err
+	if unitAddress := m.unitAddress; unitAddress != nil {
+		if err := unitAddress.Serialize(writeBuffer); err != nil {
+			return err
+		}
 	}
 	if err := m.application.Serialize(writeBuffer); err != nil {
 		return err

diff --git a/plc4go/spi/model/DefaultPlcSubscriptionResponse.go b/plc4go/spi/model/DefaultPlcSubscriptionResponse.go
@@ -21,7 +21,6 @@ package model
 
 import (
 	"github.com/apache/plc4x/plc4go/pkg/api/model"
-	"github.com/apache/plc4x/plc4go/pkg/api/values"
 	"github.com/apache/plc4x/plc4go/spi/utils"
 )
 
@@ -52,10 +51,6 @@ func (m DefaultPlcSubscriptionResponse) GetFieldNames() []string {
 	return fieldNames
 }
 
-func (m DefaultPlcSubscriptionResponse) GetValue(name string) values.PlcValue {
-	panic("not implemented: implement me")
-}
-
 func (m DefaultPlcSubscriptionResponse) Serialize(writeBuffer utils.WriteBuffer) error {
 	if err := writeBuffer.PushContext("PlcSubscriptionResponse"); err != nil {
 		return err
@@ -73,10 +68,6 @@ func (m DefaultPlcSubscriptionResponse) Serialize(writeBuffer utils.WriteBuffer)
 		if err := writeBuffer.PushContext(fieldName); err != nil {
 			return err
 		}
-		valueResponse := m.GetValue(fieldName)
-		if err := valueResponse.(utils.Serializable).Serialize(writeBuffer); err != nil {
-			return err
-		}
 		if err := writeBuffer.PopContext(fieldName); err != nil {
 			return err
 		}

diff --git a/plc4go/tools/plc4xbrowser/ui/commands.go b/plc4go/tools/plc4xbrowser/ui/commands.go
@@ -382,7 +382,7 @@ var rootCommand = Command{
 					if err := subscriptionRequestResult.GetErr(); err != nil {
 						return errors.Wrapf(err, "%s can't subscribe", connectionsString)
 					}
-					log.Info().Msgf("subscription result %s", subscriptionRequestResult.GetResponse())
+					log.Info().Msgf("subscription result\n%s", subscriptionRequestResult.GetResponse())
 				}
 				return nil
 			},