This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository undertow.
commit 8ef75e028275fdc7517f29ea877f56f1edc44fe6 Author: Markus Koschany <[email protected]> Date: Sun Apr 10 19:45:35 2016 +0200 Add JettyALPNClientProvider.patch --- debian/patches/JettyALPNClientProvider.patch | 63 ++++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 64 insertions(+) diff --git a/debian/patches/JettyALPNClientProvider.patch b/debian/patches/JettyALPNClientProvider.patch new file mode 100644 index 0000000..6fcf53f --- /dev/null +++ b/debian/patches/JettyALPNClientProvider.patch @@ -0,0 +1,63 @@ +From: Markus Koschany <[email protected]> +Date: Sun, 10 Apr 2016 19:45:14 +0200 +Subject: JettyALPNClientProvider + +--- + core/src/main/java/io/undertow/client/JDK9ALPNClientProvider.java | 2 +- + core/src/main/java/io/undertow/client/JettyALPNClientProvider.java | 2 +- + core/src/main/java/io/undertow/client/http2/Http2ClientProvider.java | 2 +- + core/src/main/java/io/undertow/client/spdy/SpdyClientProvider.java | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/core/src/main/java/io/undertow/client/JDK9ALPNClientProvider.java b/core/src/main/java/io/undertow/client/JDK9ALPNClientProvider.java +index 560a8a3..cf72eb4 100644 +--- a/core/src/main/java/io/undertow/client/JDK9ALPNClientProvider.java ++++ b/core/src/main/java/io/undertow/client/JDK9ALPNClientProvider.java +@@ -43,7 +43,7 @@ public class JDK9ALPNClientProvider implements ALPNClientSelector.ClientSelector + + + @Override +- public void runAlpn(SslConnection connection, ChannelListener<SslConnection> fallback,final ClientCallback<ClientConnection> failedListener, ALPNClientSelector.ALPNProtocol... details) { ++ public void runAlpn(final SslConnection connection, final ChannelListener<SslConnection> fallback,final ClientCallback<ClientConnection> failedListener, ALPNClientSelector.ALPNProtocol... details) { + + final SSLEngine sslEngine = UndertowXnioSsl.getSslEngine(connection); + final Map<String, ALPNClientSelector.ALPNProtocol> protocolMap = new HashMap<>(); +diff --git a/core/src/main/java/io/undertow/client/JettyALPNClientProvider.java b/core/src/main/java/io/undertow/client/JettyALPNClientProvider.java +index f02be76..01c7629 100644 +--- a/core/src/main/java/io/undertow/client/JettyALPNClientProvider.java ++++ b/core/src/main/java/io/undertow/client/JettyALPNClientProvider.java +@@ -60,7 +60,7 @@ public class JettyALPNClientProvider implements ALPNClientSelector.ClientSelecto + } + + @Override +- public void runAlpn(SslConnection connection, ChannelListener<SslConnection> fallback, ClientCallback<ClientConnection> failedListener, ALPNClientSelector.ALPNProtocol... details) { ++ public void runAlpn(final SslConnection connection, final ChannelListener<SslConnection> fallback, final ClientCallback<ClientConnection> failedListener, ALPNClientSelector.ALPNProtocol... details) { + + final SslConnection sslConnection = connection; + final SSLEngine sslEngine = UndertowXnioSsl.getSslEngine(sslConnection); +diff --git a/core/src/main/java/io/undertow/client/http2/Http2ClientProvider.java b/core/src/main/java/io/undertow/client/http2/Http2ClientProvider.java +index a29433e..245f80a 100644 +--- a/core/src/main/java/io/undertow/client/http2/Http2ClientProvider.java ++++ b/core/src/main/java/io/undertow/client/http2/Http2ClientProvider.java +@@ -133,7 +133,7 @@ public class Http2ClientProvider implements ClientProvider { + }; + } + +- public static ALPNClientSelector.ALPNProtocol alpnProtocol(final ClientCallback<ClientConnection> listener, URI uri, ByteBufferPool bufferPool, OptionMap options) { ++ public static ALPNClientSelector.ALPNProtocol alpnProtocol(final ClientCallback<ClientConnection> listener, final URI uri, final ByteBufferPool bufferPool, final OptionMap options) { + return new ALPNClientSelector.ALPNProtocol(new ChannelListener<SslConnection>() { + @Override + public void handleEvent(SslConnection connection) { +diff --git a/core/src/main/java/io/undertow/client/spdy/SpdyClientProvider.java b/core/src/main/java/io/undertow/client/spdy/SpdyClientProvider.java +index 9ab8e33..203256d 100644 +--- a/core/src/main/java/io/undertow/client/spdy/SpdyClientProvider.java ++++ b/core/src/main/java/io/undertow/client/spdy/SpdyClientProvider.java +@@ -170,7 +170,7 @@ public class SpdyClientProvider implements ClientProvider { + } + } + +- public static ALPNClientSelector.ALPNProtocol alpnProtocol(final ClientCallback<ClientConnection> listener, URI uri, ByteBufferPool bufferPool, OptionMap options , String protocol) { ++ public static ALPNClientSelector.ALPNProtocol alpnProtocol(final ClientCallback<ClientConnection> listener, URI uri, final ByteBufferPool bufferPool, final OptionMap options , String protocol) { + return new ALPNClientSelector.ALPNProtocol(new ChannelListener<SslConnection>() { + @Override + public void handleEvent(SslConnection connection) { diff --git a/debian/patches/series b/debian/patches/series index 9b2f906..bf5ebd6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ ALPN.patch +JettyALPNClientProvider.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/undertow.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
