Find reserved names when loading class

1 files changed, 2 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java
index 19063b8e7f9..03de611437d 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/ReservedMacroNames.java
@@ -18,6 +18,7 @@ import java.util.logging.Level;
  * @author lesters
  */
 public class ReservedMacroNames extends Processor {
+    private static Set<String> reservedNames = getReservedNames();
 
     public ReservedMacroNames(Search search, DeployLogger deployLogger, RankProfileRegistry rankProfileRegistry, QueryProfiles queryProfiles) {
         super(search, deployLogger, rankProfileRegistry, queryProfiles);
@@ -25,7 +26,6 @@ public class ReservedMacroNames extends Processor {
 
     @Override
     public void process() {
-        Set<String> reservedNames = getReservedNames();
         for (RankProfile rp : rankProfileRegistry.allRankProfiles()) {
             for (String macroName : rp.getMacros().keySet()) {
                 if (reservedNames.contains(macroName)) {
@@ -39,7 +39,7 @@ public class ReservedMacroNames extends Processor {
         }
     }
 
-    private Set<String> getReservedNames() {
+    private static Set<String> getReservedNames() {
         Set<String> names = new HashSet<>();
         for (String token : RankingExpressionParserConstants.tokenImage) {
             String tokenWithoutQuotes = token.substring(1, token.length()-1);