[undertow] 04/06: Drop JettyALPNClientProvider.patch. Fixed upstream.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository undertow.

commit d8ef9f670fee1958873e2e70e78360f5dcc2c6a6
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jun 5 17:48:15 2016 +0200

    Drop JettyALPNClientProvider.patch. Fixed upstream.
---
 debian/patches/JettyALPNClientProvider.patch | 68 ----------------------------
 debian/patches/series                        |  1 -
 2 files changed, 69 deletions(-)

diff --git a/debian/patches/JettyALPNClientProvider.patch b/debian/patches/JettyALPNClientProvider.patch
deleted file mode 100644
index b80f048..0000000
--- a/debian/patches/JettyALPNClientProvider.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 10 Apr 2016 19:45:14 +0200
-Subject: JettyALPNClientProvider
-
-Fix compilation error "local variable X is accessed from within inner class;
-needs to be declared final" I'm not sure why this wasn't spotted upstream or
-whether it is a Java 8 or Java 9 issue.
-
-Forwarded: no
----
- 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 bf5ebd6..9b2f906 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 ALPN.patch
-JettyALPNClientProvider.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/undertow.git