gogrlx/nats-server
1
0
Fork 0
mirror of https://github.com/gogrlx/nats-server.git synced 2026-04-02 03:38:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

Review comments

Browse Source 
Signed-off-by: Matthias Hanel <mh@synadia.com>
This commit is contained in:
Matthias Hanel
2021-07-22 11:25:56 -04:00
parent ddd665b036
commit 06ac80cdbe
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/accounts_test.go
View File

@@ -3346,7 +3346,7 @@ func TestImportSubscriptionPartialOverlapWithPrefix(t *testing.T) {
}
func TestImportSubscriptionPartialOverlapWithTransform(t *testing.T) {
cf := createConfFile(t, []byte(fmt.Sprintf(importSubscriptionOverlapTemplate, "*.*.>", "*.*.>", " to: myprefix.$2.$1.>")))
cf := createConfFile(t, []byte(fmt.Sprintf(importSubscriptionOverlapTemplate, "*.*.>", "*.*.>", "to: myprefix.$2.$1.>")))
defer removeFile(t, cf)
s, opts := RunServerWithConfig(cf)

9
server/client.go
View File

@@ -2509,9 +2509,10 @@ func (c *client) addShadowSubscriptions(acc *Account, sub *subscription) error {
for _, tk := range tokens {
if tk == pwcs {
hasWC = true
break
}
}
if tokens[len(tokens)-1] == fwcs {
if !hasWC && tokens[len(tokens)-1] == fwcs {
hasWC = true
}
}
@@ -2524,7 +2525,7 @@ func (c *client) addShadowSubscriptions(acc *Account, sub *subscription) error {
continue
}
if subj == im.to {
ims = append(ims, ime{im, "", false})
ims = append(ims, ime{im, _EMPTY_, false})
continue
}
if tokensModified {
@@ -2537,10 +2538,10 @@ func (c *client) addShadowSubscriptions(acc *Account, sub *subscription) error {
tokenizeSubjectIntoSlice(im.to, &imTokens)
if isSubsetMatchTokenized(tokens, imTokens) {
ims = append(ims, ime{im, "", true})
ims = append(ims, ime{im, _EMPTY_, true})
} else if hasWC {
if isSubsetMatchTokenized(imTokens, tokens) {
ims = append(ims, ime{im, "", false})
ims = append(ims, ime{im, _EMPTY_, false})
} else {
imTokensLen := len(imTokens)
for i, t := range tokens {