Remove on Vespa 8

2 files changed, 4 insertions, 14 deletions

diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
index b56743954f4..7060a23111b 100644
--- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
+++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java
@@ -189,19 +189,9 @@ public class ConnectorFactory {
 
     @SuppressWarnings("removal")
     private SslContextFactory createSslContextFactory() {
-        try {
-            DefaultConnectorSsl ssl = new DefaultConnectorSsl();
-            sslProvider.configureSsl(ssl, connectorConfig.name(), connectorConfig.listenPort());
-            return ssl.createSslContextFactory();
-        } catch (UnsupportedOperationException e) {
-            // TODO(bjorncs) Vespa 8 Remove this compatibility workaround
-            if (sslProvider instanceof SslContextFactoryProvider) {
-                return ((SslContextFactoryProvider) sslProvider)
-                        .getInstance(connectorConfig.name(), connectorConfig.listenPort());
-            } else {
-                throw e;
-            }
-        }
+        DefaultConnectorSsl ssl = new DefaultConnectorSsl();
+        sslProvider.configureSsl(ssl, connectorConfig.name(), connectorConfig.listenPort());
+        return ssl.createSslContextFactory();
     }
 
     private ALPNServerConnectionFactory newAlpnConnectionFactory() {
diff --git a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
index 4a50018c3c3..44165bf14c3 100644
--- a/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
+++ b/container-core/src/main/resources/configdefinitions/container.core.vip-status.def
@@ -8,5 +8,5 @@ accessdisk bool default=false
 ## If the path is relative vespa home is prepended
 statusfile string default="share/qrsdocs/status.html"
 
-## Not used TODO: Remove on Vespa 8? - always set to true?
+## Whether this container should be in rotation by default on startup
 initiallyInRotation bool default=true