SslKeyStoreConfigurator components must have unique id spec

1 files changed, 3 insertions, 2 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
index 32c18292c47..d9c9050780c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ConnectorFactory.java
@@ -148,13 +148,14 @@ public class ConnectorFactory extends SimpleComponent implements ConnectorConfig
     }
 
     private static SimpleComponent getSslKeyStoreConfigurator(String name, Element sslKeystoreConfigurator) {
+        String idSpec = "ssl-keystore-configurator@" + name;
         if (sslKeystoreConfigurator != null) {
             String className = sslKeystoreConfigurator.getAttribute("class");
             String bundleName = sslKeystoreConfigurator.getAttribute("bundle");
-            return new SimpleComponent(new ComponentModel(name, className, bundleName));
+            return new SimpleComponent(new ComponentModel(idSpec, className, bundleName));
         } else {
             return new SimpleComponent(
-                    new ComponentModel(name, DefaultSslKeyStoreConfigurator.class.getName(), "jdisc_http_service"));
+                    new ComponentModel(idSpec, DefaultSslKeyStoreConfigurator.class.getName(), "jdisc_http_service"));
         }
     }