Fix an issue related to delay confirm values

ella-to · May 19, 2024 · 097e0a6 · 097e0a6
1 parent 23ce938
commit 097e0a6
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/client/client.go b/client/client.go
@@ -195,6 +195,10 @@ func (c *Client) Get(ctx context.Context, consumerOpts ...bus.ConsumerOpt) iter.
 					}
 				}
 
+				if !yield(msg, err) {
+					return
+				}
+
 				for _, evt := range events {
 					if evt.ReplyCount > 0 {
 						confirmEvent, err := bus.NewEvent(bus.WithSubject(evt.Reply), bus.WithData([]byte(`{"type":"confirm"}`)))
@@ -212,13 +216,15 @@ func (c *Client) Get(ctx context.Context, consumerOpts ...bus.ConsumerOpt) iter.
 				events = nil
 				msg = nil
 				err = fmt.Errorf("%s", incoming.Data)
+
+				if !yield(msg, err) {
+					return
+				}
+
 			case "done":
 				return
 			}
 
-			if !yield(msg, err) {
-				break
-			}
 		}
 	}
 }