Skip to content

Commit

Permalink
Cleanup tests
Browse files Browse the repository at this point in the history
Signed-off-by: Tomasz Pietrek <tomasz@nats.io>
  • Loading branch information
Jarema committed Feb 1, 2023
1 parent 10c405d commit 6754604
Show file tree
Hide file tree
Showing 2 changed files with 122 additions and 247 deletions.
5 changes: 0 additions & 5 deletions server/consumer.go
Expand Up @@ -505,7 +505,6 @@ func checkConsumerCfg(
return NewJSConsumerEmptyFilterError()
}
}

subjectFilters := gatherSubjectFilters(config.FilterSubject, config.FilterSubjects)

// Check subject filters overlap.
Expand Down Expand Up @@ -3058,7 +3057,6 @@ func (o *consumer) isFilteredMatch(subj string) bool {
if subjectIsSubsetMatch(subj, filter.subject) {
return true
}

}
return false
}
Expand Down Expand Up @@ -3140,12 +3138,10 @@ func (o *consumer) getNextMsg() (*jsPubMsg, uint64, error) {
o.updateSkipped(o.sseq)
}
}

if sm == nil {
pmsg.returnToPool()
return nil, 0, err
}

return pmsg, 1, err
}

Expand Down Expand Up @@ -4236,7 +4232,6 @@ func (o *consumer) selectStartingSeqNo() {
filter.nextSeq = state.LastSeq + 1
}
}

}
if o.subjf != nil {
sort.Slice(o.subjf, func(i, j int) bool {
Expand Down

0 comments on commit 6754604

Please sign in to comment.