external/java_websocket/UnpackedTarball_java_websocket.mk
| 1
external/java_websocket/patches/0001-cid-1546192-SIC-Inner-class-could-be-made-static.patch
| 25 ++++++++++
ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
| 3 -
3 files changed, 28 insertions(+), 1 deletion(-)
New commits:
commit 506fb766885f147a40f09ffca803b4e31b14b1e1
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Sep 30 19:47:11 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Sep 30 22:20:52 2023 +0200
cid#1546192 SIC: Inner class could be made static
Change-Id: Ib8a298d86a7f04a2ca63751e3e39960e276b6514
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157439
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/external/java_websocket/UnpackedTarball_java_websocket.mk
b/external/java_websocket/UnpackedTarball_java_websocket.mk
index cc8e7c259fc9..d66795511caa 100644
--- a/external/java_websocket/UnpackedTarball_java_websocket.mk
+++ b/external/java_websocket/UnpackedTarball_java_websocket.mk
@@ -16,6 +16,7 @@ $(eval $(call
gb_UnpackedTarball_set_patchlevel,java_websocket,1))
$(eval $(call gb_UnpackedTarball_add_patches,java_websocket,\
external/java_websocket/patches/ant-build.patch \
external/java_websocket/patches/no-slf4j.patch \
+
external/java_websocket/patches/0001-cid-1546192-SIC-Inner-class-could-be-made-static.patch
\
))
# vim: set noet sw=4 ts=4:
diff --git
a/external/java_websocket/patches/0001-cid-1546192-SIC-Inner-class-could-be-made-static.patch
b/external/java_websocket/patches/0001-cid-1546192-SIC-Inner-class-could-be-made-static.patch
new file mode 100644
index 000000000000..ea7c56c03689
--- /dev/null
+++
b/external/java_websocket/patches/0001-cid-1546192-SIC-Inner-class-could-be-made-static.patch
@@ -0,0 +1,25 @@
+From 2fc9513baa5b6e1d9fd26edef5816e598805754c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
+Date: Sat, 30 Sep 2023 19:45:58 +0100
+Subject: [PATCH] cid#1546192 SIC: Inner class could be made static
+
+---
+ src/main/java/org/java_websocket/drafts/Draft_6455.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/java_websocket/drafts/Draft_6455.java
b/src/main/java/org/java_websocket/drafts/Draft_6455.java
+index eb48799..f9f960d 100644
+--- a/src/main/java/org/java_websocket/drafts/Draft_6455.java
++++ b/src/main/java/org/java_websocket/drafts/Draft_6455.java
+@@ -1192,7 +1192,7 @@ public class Draft_6455 extends Draft {
+ return totalSize;
+ }
+
+- private class TranslatedPayloadMetaData {
++ private static class TranslatedPayloadMetaData {
+
+ private int payloadLength;
+ private int realPackageSize;
+--
+2.41.0
+
commit adde35839be1b302547ec39bc330999dc3d55727
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sat Sep 30 19:35:50 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Sat Sep 30 22:20:45 2023 +0200
cid#1545655 Dm: Dubious method used
Change-Id: I76b447d51429c867e24c1bcdd357689c849ea103
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157438
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git
a/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
b/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
index d408046b13ed..cdffa43faf6c 100644
--- a/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
+++ b/ridljar/com/sun/star/lib/connections/websocket/WebsocketConnection.java
@@ -30,6 +30,7 @@ import java.net.ProtocolException;
import java.net.Socket;
import java.net.URI;
import java.net.URISyntaxException;
+import java.nio.charset.StandardCharsets;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Arrays;
@@ -260,7 +261,7 @@ public class WebsocketConnection extends WebSocketClient
implements XConnection,
return;
}
- byte[] messageBytes = messageParts[1].getBytes();
+ byte[] messageBytes = messageParts[1].getBytes(StandardCharsets.UTF_8);
try {
_inputStreamWriter.write(messageBytes);
