Merge pull request #1511 from yahoo/balder/move-guard-down

Move the guard to get the names too.

1 files changed, 3 insertions, 3 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp b/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp
index 40b05001a2e..08bf2029e18 100644
--- a/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp
+++ b/searchcore/src/vespa/searchcore/proton/matching/match_master.cpp
@@ -108,9 +108,6 @@ FeatureSet::SP
 MatchMaster::getFeatureSet(const MatchToolsFactory &matchToolsFactory,
                            const std::vector<uint32_t> &docs, bool summaryFeatures)
 {
-    if (docs.empty()) {
-        return std::make_shared<FeatureSet>();
-    }
     MatchTools::UP matchTools = matchToolsFactory.createMatchTools();
     RankProgram::UP rankProgram = summaryFeatures ? matchTools->summary_program() :
             matchTools->dump_program();
@@ -122,6 +119,9 @@ MatchMaster::getFeatureSet(const MatchToolsFactory &matchToolsFactory,
         featureNames.emplace_back(resolver.name_of(i));
     }
     FeatureSet::SP retval(new FeatureSet(featureNames, docs.size()));
+    if (docs.empty()) {
+        return retval;
+    }
     FeatureSet &fs = *retval.get();
 
     SearchIterator::UP search = matchTools->createSearch(rankProgram->match_data());