fix. Reset proto before Unmarshall

imperiuse · Dec 24, 2020 · e269347 · e269347
1 parent b5278e8
commit e269347
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/nats/client.go b/nats/client.go
@@ -221,6 +221,8 @@ func (c *client) ReplyHandler(subj Subj, awaitData Serializable, msgHandler Hand
 			return
 		}
 
+		awaitData.Reset() // Important! For use clean struct
+
 		if err := awaitData.Unmarshal(msg.Data); err != nil {
 			c.log.Error("[ReplyHandler] Unmarshal",
 				zap.String("subj", string(subj)),
@@ -260,6 +262,8 @@ func (c *client) ReplyQueueHandler(subj Subj, qGroup QueueGroup, awaitData Seria
 			return
 		}
 
+		awaitData.Reset() // Important! For use clean struct
+
 		if err := awaitData.Unmarshal(msg.Data); err != nil {
 			c.log.Error("[ReplyQueueHandler] Unmarshal",
 				zap.String("subj", string(subj)),

diff --git a/serializable/json/json.go b/serializable/json/json.go
@@ -35,3 +35,7 @@ func (e *Example) Unmarshal(data []byte) error {
 	}
 	return err
 }
+
+func (e *Example) Reset() {
+	return
+}
diff --git a/serializable/mock/serializable.go b/serializable/mock/serializable.go
@@ -20,10 +20,18 @@ func (d *DataMock) Unmarshal(data []byte) error {
 	return nil
 }
 
+func (d *DataMock) Reset() {
+	return
+}
+
 func (d *BadDataMock) Marshal() ([]byte, error) {
 	return nil, ErrBadDataMock
 }
 
 func (d *BadDataMock) Unmarshal([]byte) error {
 	return ErrBadDataMock
 }
+
+func (d *BadDataMock) Reset() {
+	return
+}
diff --git a/serializable/serializable.go b/serializable/serializable.go
@@ -4,5 +4,6 @@ type (
 	Serializable interface {
 		Marshal() ([]byte, error)
 		Unmarshal([]byte) error
+		Reset()
 	}
 )
diff --git a/streaming/client.go b/streaming/client.go
@@ -286,6 +286,8 @@ func (c *client) Subscribe(subj Subj, awaitData Serializable, handler Handler, o
 			return
 		}
 
+		awaitData.Reset() // Important! For use clean struct
+
 		if err := awaitData.Unmarshal(msg.Data); err != nil {
 			c.log.Error("[Subscribe] Unmarshal",
 				zap.Error(err),
@@ -331,6 +333,8 @@ func (c *client) QueueSubscribe(subj Subj, qgroup QueueGroup, awaitData Serializ
 			return
 		}
 
+		awaitData.Reset() // Important! For use clean struct
+
 		if err := awaitData.Unmarshal(msg.Data); err != nil {
 			c.log.Error("[QueueSubscribe] Unmarshal",
 				zap.String("subj", string(subj)),
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,3 +35,7 @@ func (e *Example) Unmarshal(data []byte) error { @@
     	}
     	return err
     }
+    func (e *Example) Reset() {
+    	return
+    }