summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2020-06-23 08:40:15 +0200
committerGitHub <noreply@github.com>2020-06-23 08:40:15 +0200
commit749b7f7637c8b5c80dfe813d04c5301054b311c4 (patch)
tree0808a98817cf84f9ee7476632e6df0db5d9b4219
parent596000806da47c61a19447e7401b65271b48f9ec (diff)
parent65b517d259fe417ce0cdb417336ef839e396a820 (diff)
Merge pull request #13654 from vespa-engine/lesters/dont-add-function-names-multiple-times
Don't add function names multiple times
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
index f8b48da291d..e618326eff5 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/ml/ConvertedModel.java
@@ -553,9 +553,10 @@ public class ConvertedModel {
if (node instanceof ReferenceNode) {
ReferenceNode referenceNode = (ReferenceNode)node;
if (referenceNode.getOutput() == null) { // function references cannot specify outputs
- names.add(referenceNode.getName());
- if (model.functions().containsKey(referenceNode.getName())) {
- addFunctionNamesIn(RankingExpression.from(model.functions().get(referenceNode.getName())).getRoot(), names, model);
+ if (names.add(referenceNode.getName())) {
+ if (model.functions().containsKey(referenceNode.getName())) {
+ addFunctionNamesIn(RankingExpression.from(model.functions().get(referenceNode.getName())).getRoot(), names, model);
+ }
}
}
}