Make executor never null

1 files changed, 2 insertions, 1 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java b/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java
index 3ec29a77323..210a77ccf57 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/ExecutionFactory.java
@@ -23,6 +23,7 @@ import com.yahoo.search.rendering.RendererRegistry;
 import com.yahoo.vespa.configdefinition.SpecialtokensConfig;
 
 import java.util.concurrent.Executor;
+import java.util.concurrent.Executors;
 
 /**
  * Provides creation of fully configured query Execution instances.
@@ -65,7 +66,7 @@ public class ExecutionFactory extends AbstractComponent {
         this.specialTokens = new SpecialTokenRegistry(specialTokens);
         this.linguistics = linguistics;
         this.rendererRegistry = new RendererRegistry(renderers.allComponents());
-        this.executor = executor;
+        this.executor = executor != null ? executor : Runnable::run;
     }
 
     /** @deprecated pass the container threadpool */