This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository undertow.
commit 640ce0c584b1c1cd22f9f742ad59395a420faac7 Author: Markus Koschany <a...@debian.org> Date: Sun Dec 3 20:48:54 2017 +0100 Add websockets-jsr.patch and implement a yet unsupported new method introduced by the recent update of libtomcat8-java to version 8.5.24. Closes: #883357 Thanks: Adrian Bunk for the report. --- debian/patches/no-wildfly.patch | 2 +- debian/patches/series | 1 + debian/patches/websockets-jsr.patch | 29 +++++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/debian/patches/no-wildfly.patch b/debian/patches/no-wildfly.patch index 9768519..42bbb2c 100644 --- a/debian/patches/no-wildfly.patch +++ b/debian/patches/no-wildfly.patch @@ -7,7 +7,7 @@ Subject: no wildfly 1 file changed, 6 deletions(-) diff --git a/core/src/test/java/io/undertow/testutils/DefaultServer.java b/core/src/test/java/io/undertow/testutils/DefaultServer.java -index a00f12c..2c80a21 100644 +index a546e01..a984d83 100644 --- a/core/src/test/java/io/undertow/testutils/DefaultServer.java +++ b/core/src/test/java/io/undertow/testutils/DefaultServer.java @@ -53,7 +53,6 @@ import org.junit.runners.BlockJUnit4ClassRunner; diff --git a/debian/patches/series b/debian/patches/series index 1609c2d..5f267f2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ ALPN.patch no-wildfly.patch +websockets-jsr.patch diff --git a/debian/patches/websockets-jsr.patch b/debian/patches/websockets-jsr.patch new file mode 100644 index 0000000..33a9a81 --- /dev/null +++ b/debian/patches/websockets-jsr.patch @@ -0,0 +1,29 @@ +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