diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2019-04-15 14:41:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-15 14:41:22 +0200 |
| commit | 8491b87f228a63c1b9e74c9aef5cde5368d268c5 (patch) | |
| tree | 00eaaf3b8f8e0df383bf0edb3db01e2fb144ae20 /jdisc_http_service | |
| parent | 4fb345cfda60cd79fad7c0355e470982bfc920f3 (diff) | |
Revert "Upgrade Jetty to 9.4.16"
Diffstat (limited to 'jdisc_http_service')
3 files changed, 3 insertions, 3 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java index f6f79691626..facb54bc37a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java @@ -37,7 +37,7 @@ public class ConfiguredSslContextFactoryProvider implements SslContextFactoryPro public SslContextFactory getInstance(String containerId, int port) { ConnectorConfig.Ssl sslConfig = connectorConfig.ssl(); if (!sslConfig.enabled()) throw new IllegalStateException(); - SslContextFactory.Server factory = new JDiscSslContextFactory(); + SslContextFactory factory = new JDiscSslContextFactory(); switch (sslConfig.clientAuth()) { case NEED_AUTH: diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java index 4d3bb4a280a..90d67996402 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/JDiscSslContextFactory.java @@ -13,7 +13,7 @@ import java.util.Objects; * * @author bjorncs */ -class JDiscSslContextFactory extends SslContextFactory.Server { +class JDiscSslContextFactory extends SslContextFactory { private String trustStorePassword; diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java index a5652042f9e..d7d28e7d242 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextManagedSslContextFactory.java @@ -13,7 +13,7 @@ import java.net.InetSocketAddress; * * @author bjorncs */ -class TlsContextManagedSslContextFactory extends SslContextFactory.Server { +class TlsContextManagedSslContextFactory extends SslContextFactory { private final TlsContext tlsContext; |