Create SimpleLinguistics singleton lazily.

1 files changed, 2 insertions, 1 deletions

diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
index f35491aa9cf..ad99218b860 100644
--- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
+++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java
@@ -4,6 +4,7 @@ package com.yahoo.container.core.config.testutil;
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
+import com.google.inject.Scopes;
 import com.yahoo.component.AbstractComponent;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.config.subscription.ConfigSourceSet;
@@ -134,7 +135,7 @@ public class HandlersConfigurerTestWrapper {
             @Override
             protected void configure() {
                 // Needed by e.g. SearchHandler
-                bind(Linguistics.class).toInstance(new SimpleLinguistics());
+                bind(Linguistics.class).to(SimpleLinguistics.class).in(Scopes.SINGLETON);
             }
         });
     }