diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-04-20 11:17:00 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-04-20 11:17:00 +0200 |
| commit | af6ec91b1728be3390bdfa6ccd638b06b473592b (patch) | |
| tree | fccb0b9a036c93594db72790bb66c03d50254862 /container-core | |
| parent | 901237f0a48223b8971c56c95e0d7b41e3974d33 (diff) | |
Deduplicate
Diffstat (limited to 'container-core')
| -rw-r--r-- | container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/ConnectorFactory.java | 6 |
1 files changed, 2 insertions, 4 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 0a109f5baf5..63bd1495104 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 @@ -106,12 +106,11 @@ public class ConnectorFactory { ALPNServerConnectionFactory alpnFactory = newAlpnConnectionFactory(List.of(http1Factory, http2Factory), http1Factory); SslConnectionFactory sslFactory = newSslConnectionFactory(metric, alpnFactory); if (proxyProtocolConfig.enabled()) { + ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); if (proxyProtocolConfig.mixedMode()) { - ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); DetectorConnectionFactory detectorFactory = newDetectorConnectionFactory(sslFactory, proxyProtocolFactory); return List.of(detectorFactory, proxyProtocolFactory, sslFactory, alpnFactory, http1Factory, http2Factory); } else { - ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); return List.of(proxyProtocolFactory, sslFactory, alpnFactory, http1Factory, http2Factory); } } else { @@ -120,12 +119,11 @@ public class ConnectorFactory { } else { SslConnectionFactory sslFactory = newSslConnectionFactory(metric, http1Factory); if (proxyProtocolConfig.enabled()) { + ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); if (proxyProtocolConfig.mixedMode()) { - ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); DetectorConnectionFactory detectorFactory = newDetectorConnectionFactory(sslFactory, proxyProtocolFactory); return List.of(detectorFactory, proxyProtocolFactory, sslFactory, http1Factory); } else { - ProxyConnectionFactory proxyProtocolFactory = newProxyProtocolConnectionFactory(sslFactory); return List.of(proxyProtocolFactory, sslFactory, http1Factory); } } else { |