From c60cca7b8cd5ca6f67021dc8cceeb8bf76721bc3 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 13 Jul 2016 11:59:02 +1000 Subject: [PATCH 1/2] clean up import --- .../test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java index 99a6b41fb93..131cd96d371 100644 --- a/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java +++ b/jetty-servlet/src/test/java/org/eclipse/jetty/servlet/ServletHandlerTest.java @@ -26,7 +26,6 @@ import java.util.EnumSet; import javax.servlet.DispatcherType; -import org.eclipse.jetty.server.handler.HandlerWrapper; import org.junit.Before; import org.junit.Test; From c27d71a5a8cb80fa0eae892d042f134d82d04623 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Wed, 13 Jul 2016 11:59:46 +1000 Subject: [PATCH 2/2] Expose public constructor for #689 --- .../jetty/http2/server/HTTP2ServerConnectionFactory.java | 2 +- .../jetty/http2/server/RawHTTP2ServerConnectionFactory.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java index e69ef2efaa8..42b63f6ec9a 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HTTP2ServerConnectionFactory.java @@ -50,7 +50,7 @@ public class HTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnectionF super(httpConfiguration); } - protected HTTP2ServerConnectionFactory(@Name("config") HttpConfiguration httpConfiguration,String... protocols) + public HTTP2ServerConnectionFactory(@Name("config") HttpConfiguration httpConfiguration,String... protocols) { super(httpConfiguration,protocols); } diff --git a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java index ab01369d93c..fa3dc54f4d9 100644 --- a/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java +++ b/jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/RawHTTP2ServerConnectionFactory.java @@ -33,6 +33,12 @@ public class RawHTTP2ServerConnectionFactory extends AbstractHTTP2ServerConnecti this.listener = listener; } + public RawHTTP2ServerConnectionFactory(HttpConfiguration httpConfiguration, ServerSessionListener listener, String... protocols) + { + super(httpConfiguration,protocols); + this.listener = listener; + } + @Override protected ServerSessionListener newSessionListener(Connector connector, EndPoint endPoint) {