зеркало из https://github.com/mozilla/scribe.git
don't merge nil criteria from chain results
This commit is contained in:
Родитель
ae9069bd9b
Коммит
4b40df55f7
|
@ -105,7 +105,9 @@ func (f *filecontent) fireChains(d *Document) ([]evaluationCriteria, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
oc.mergeCriteria(criteria)
|
||||
if criteria != nil {
|
||||
oc.mergeCriteria(criteria)
|
||||
}
|
||||
|
||||
// Extract the criteria. Rewrite the identifier based
|
||||
// on what identifier was used for the chain.
|
||||
|
|
|
@ -83,7 +83,9 @@ func (o *object) fireChains(d *Document) error {
|
|||
o.err = err
|
||||
return err
|
||||
}
|
||||
si.mergeCriteria(criteria)
|
||||
if criteria != nil {
|
||||
si.mergeCriteria(criteria)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче