Merge "Mock Adapter: Switch back to handlers once the queue is empty."

diff --git a/adapter/mock/mock_adapter.go b/adapter/mock/mock_adapter.go
index af54ced..d8a80d6 100644 (file)
--- a/adapter/mock/mock_adapter.go
+++ b/adapter/mock/mock_adapter.go
@@ -261,6 +261,11 @@ func (a *VppAdapter) SendMsg(clientID uint32, data []byte) error {
                }
                if len(replies) > 0 {
                        replies = []api.Message{}
+                       if len(replyHandlers) > 0 {
+                               // Switch back to handlers once the queue is empty to revert back
+                               // the fallthrough effect.
+                               mode = useReplyHandlers
+                       }
                        return nil
                }