From e4f1106f094c8f783e702807766c2eb5faf34a5c Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 19 Dec 2019 10:11:54 +0100 Subject: [PATCH 1/2] Fixes #4421 - HttpClient support for PROXY protocol. Fixed visibility of ProxyProtocolConnection. Must be protected because it's the return type of protected methods. Signed-off-by: Simone Bordet --- .../jetty/client/ProxyProtocolClientConnectionFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java b/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java index fac784d5bcf..58e032abf03 100644 --- a/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java +++ b/jetty-client/src/main/java/org/eclipse/jetty/client/ProxyProtocolClientConnectionFactory.java @@ -444,7 +444,7 @@ public abstract class ProxyProtocolClientConnectionFactory implements ClientConn protected abstract ProxyProtocolConnection newProxyProtocolConnection(EndPoint endPoint, Map context); - private abstract static class ProxyProtocolConnection extends AbstractConnection implements Callback + protected abstract static class ProxyProtocolConnection extends AbstractConnection implements Callback { protected static final Logger LOG = Log.getLogger(ProxyProtocolConnection.class); From 26b0445a9eca513d7ecfa133c5286f70d255543b Mon Sep 17 00:00:00 2001 From: Simone Bordet Date: Thu, 19 Dec 2019 11:53:20 +0100 Subject: [PATCH 2/2] Fixed visibility of Scanner.Visitor. Must be package private because it uses TimeNSize in method signatures, that is also package private. Signed-off-by: Simone Bordet --- jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java b/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java index 28aba9587c9..871e2352ce9 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/Scanner.java @@ -153,7 +153,7 @@ public class Scanner extends AbstractLifeCycle * A FileVisitor for walking a subtree of paths. The Scanner uses * this to examine the dirs and files it has been asked to scan. */ - public class Visitor implements FileVisitor + class Visitor implements FileVisitor { Map scanInfoMap; IncludeExcludeSet rootIncludesExcludes;