Add initialization in callback

Signed-off-by: Siddhant Deshmukh <deshsid@amazon.com>
deshsidd · Oct 13, 2023 · 39dc8d9 · 39dc8d9
1 parent 1a6e858
commit 39dc8d9
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java b/server/src/main/java/org/opensearch/action/search/TransportSearchAction.java
@@ -182,7 +182,7 @@ public class TransportSearchAction extends HandledTransportAction<SearchRequest,
 
     private final MetricsRegistry metricsRegistry;
 
-    private final SearchQueryCategorizor searchQueryCategorizor;
+    private SearchQueryCategorizor searchQueryCategorizor;
 
     @Inject
     public TransportSearchAction(
@@ -221,15 +221,13 @@ public TransportSearchAction(
         this.isSearchQueryCategorizationEnabled = clusterService.getClusterSettings().get(SEARCH_QUERY_CATEGORIZATION_ENABLED_SETTING);
         clusterService.getClusterSettings()
             .addSettingsUpdateConsumer(SEARCH_QUERY_CATEGORIZATION_ENABLED_SETTING, this::setIsSearchQueryCategorizationEnabled);
-        if (isSearchQueryCategorizationEnabled) {
-            this.searchQueryCategorizor = new SearchQueryCategorizor(metricsRegistry);
-        } else {
-            this.searchQueryCategorizor = null;
-        }
     }
 
     private void setIsSearchQueryCategorizationEnabled(boolean isSearchQueryCategorizationEnabled) {
         this.isSearchQueryCategorizationEnabled = isSearchQueryCategorizationEnabled;
+        if (this.isSearchQueryCategorizationEnabled && this.searchQueryCategorizor == null) {
+            this.searchQueryCategorizor = new SearchQueryCategorizor(metricsRegistry);
+        }
     }
 
     private void setIsRequestStatsEnabled(boolean isRequestStatsEnabled) {