This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository undertow.
commit 9179a0935bd0c1ee0f5a84705e690e218ef7b591 Author: Markus Koschany <a...@debian.org> Date: Wed Jan 17 21:11:07 2018 +0100 Drop websockets-jsr.patch. Not needed anymore. --- debian/patches/series | 1 - debian/patches/websockets-jsr.patch | 29 ----------------------------- 2 files changed, 30 deletions(-) diff --git a/debian/patches/series b/debian/patches/series index 5f267f2..1609c2d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ ALPN.patch no-wildfly.patch -websockets-jsr.patch diff --git a/debian/patches/websockets-jsr.patch b/debian/patches/websockets-jsr.patch deleted file mode 100644 index 33a9a81..0000000 --- a/debian/patches/websockets-jsr.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Markus Koschany <a...@debian.org> -Date: Sun, 3 Dec 2017 20:47:50 +0100 -Subject: websockets-jsr - -Implement a yet unsupported new method introduced by the recent update of -libtomcat8-java to version 8.5.24. - -Bug-Debian: https://bugs.debian.org/883357 -Forwarded: no ---- - .../java/io/undertow/websockets/jsr/ServerWebSocketContainer.java | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/ServerWebSocketContainer.java b/websockets-jsr/src/main/java/io/undertow/websockets/jsr/ServerWebSocketContainer.java -index bbcec93..d896cfa 100644 ---- a/websockets-jsr/src/main/java/io/undertow/websockets/jsr/ServerWebSocketContainer.java -+++ b/websockets-jsr/src/main/java/io/undertow/websockets/jsr/ServerWebSocketContainer.java -@@ -179,6 +179,11 @@ public class ServerWebSocketContainer implements ServerContainer, Closeable { - this.defaultAsyncSendTimeout = defaultAsyncSendTimeout; - } - -+ @Override -+ public void setDefaultAsyncSendTimeout(long defaultAsyncSendTimeout) { -+ this.defaultAsyncSendTimeout = defaultAsyncSendTimeout; -+ } -+ - public Session connectToServer(final Object annotatedEndpointInstance, WebSocketClient.ConnectionBuilder connectionBuilder) throws DeploymentException, IOException { - if(closed) { - throw new ClosedChannelException(); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/undertow.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits