summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@broadpark.no>2020-02-21 12:37:08 +0100
committerTor Egge <Tor.Egge@broadpark.no>2020-02-21 12:37:08 +0100
commit802c4ed261085c6d79176aff42ab2976260ab8e2 (patch)
tree9b94218509aa294bb26a3e421c5fbe310b8bca79 /searchlib
parent62ec6891944aa21747a1723358dea0a7768ad0d3 (diff)
Call fixup_feature_map() from failed() method.
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
index 7b87486b995..82a69009e82 100644
--- a/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
+++ b/searchlib/src/vespa/searchlib/fef/blueprintresolver.cpp
@@ -85,6 +85,7 @@ struct Compiler : public Blueprint::DependencyHandler {
}
compile_error = true;
}
+ fixup_feature_map();
return FeatureRef();
}
@@ -121,16 +122,13 @@ struct Compiler : public Blueprint::DependencyHandler {
self().spec.blueprint->setName(parser.executorName());
self().spec.blueprint->attach_dependency_handler(*this);
if (!self().spec.blueprint->setup(index_env, parser.parameters())) {
- fixup_feature_map();
return failed(parser.featureName(), "invalid parameters");
}
if (parser.output().empty() && self().spec.output_types.empty()) {
- fixup_feature_map();
return failed(parser.featureName(), "has no output value");
}
const auto &feature = feature_map.find(parser.featureName());
if (feature == feature_map.end()) {
- fixup_feature_map();
return failed(parser.featureName(),
vespalib::make_string("unknown output: '%s'", parser.output().c_str()));
}