Merge branch 'main' into dev

This commit is contained in:
Derek Collison
2023-07-11 14:36:10 -07:00
3 changed files with 309 additions and 5 deletions

View File

@@ -2337,8 +2337,11 @@ func (c *client) processLeafSub(argo []byte) (err error) {
spoke := c.isSpokeLeafNode()
c.mu.Unlock()
if err := c.addShadowSubscriptions(acc, sub); err != nil {
c.Errorf(err.Error())
// Only add in shadow subs if a new sub or qsub.
if osub == nil {
if err := c.addShadowSubscriptions(acc, sub); err != nil {
c.Errorf(err.Error())
}
}
// If we are not solicited, treat leaf node subscriptions similar to a