From 74be0b686448e8e214c95843e9e843a032e851d7 Mon Sep 17 00:00:00 2001 From: xiaochen-db Date: Thu, 27 Apr 2023 12:24:50 -0700 Subject: [PATCH 1/3] getIdleTimeout returns 60 sec --- .../jetty/websocket/common/BlockingWriteCallback.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java index 2763eb56c5e2..1dc4a5b8436e 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java @@ -37,7 +37,12 @@ public WriteBlocker acquireWriteBlocker() throws IOException { return new WriteBlocker(acquire()); } - + protected long getIdleTimeout() + { + // 60 seconds + return 60000; + } + public static class WriteBlocker implements WriteCallback, Callback.NonBlocking, AutoCloseable { private final Blocker blocker; From 87bb8610ee275ee8d1a5d768eb5e55028358c9dc Mon Sep 17 00:00:00 2001 From: xiaochen-db Date: Thu, 27 Apr 2023 13:28:46 -0700 Subject: [PATCH 2/3] refactors --- .../jetty/websocket/common/BlockingWriteCallback.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java index 1dc4a5b8436e..f71465f3ffc0 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java @@ -37,10 +37,11 @@ public WriteBlocker acquireWriteBlocker() throws IOException { return new WriteBlocker(acquire()); } + protected long getIdleTimeout() { - // 60 seconds - return 60000; + // Timeout if sending message takes more than 30 sec + return 30000; } public static class WriteBlocker implements WriteCallback, Callback.NonBlocking, AutoCloseable From b8c60ca8b0fa7c999e7b54b4232c6125aa02a7fe Mon Sep 17 00:00:00 2001 From: xiaochen-db Date: Sun, 30 Apr 2023 23:46:53 -0700 Subject: [PATCH 3/3] add @Override tag --- .../eclipse/jetty/websocket/common/BlockingWriteCallback.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java index f71465f3ffc0..f2828cc09639 100644 --- a/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java +++ b/jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/BlockingWriteCallback.java @@ -38,6 +38,7 @@ public WriteBlocker acquireWriteBlocker() throws IOException return new WriteBlocker(acquire()); } + @Override protected long getIdleTimeout() { // Timeout if sending message takes more than 30 sec