From e7bac7b6e9a8b8e9c70a5ff431c03e5350283433 Mon Sep 17 00:00:00 2001 From: Violeta Georgieva Date: Mon, 4 Jul 2022 11:39:56 +0300 Subject: [PATCH] Channel.bytesBeforeUnwritable() is renamed to writableBytes() and isWritable() is removed (#2351) - https://github.com/netty/netty/pull/12530 - Temporary build on CI with PR in sock-proxy https://github.com/netty-contrib/socks-proxy/pull/10 --- .github/workflows/check_transport.yml | 4 +++- .../src/main/java/reactor/netty/channel/MonoSendMany.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check_transport.yml b/.github/workflows/check_transport.yml index 6f4f807e37..999627223c 100644 --- a/.github/workflows/check_transport.yml +++ b/.github/workflows/check_transport.yml @@ -68,8 +68,10 @@ jobs: path: codec-extras - uses: actions/checkout@v3 with: - repository: netty-contrib/socks-proxy + # TODO temporary https://github.com/netty-contrib/socks-proxy/pull/10 + repository: violetagg/socks-proxy path: socks-proxy + ref: pending-write-queue - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK 17 uses: actions/setup-java@v3 diff --git a/reactor-netty-core/src/main/java/reactor/netty/channel/MonoSendMany.java b/reactor-netty-core/src/main/java/reactor/netty/channel/MonoSendMany.java index d45bdf39f4..a295ced7f7 100644 --- a/reactor-netty-core/src/main/java/reactor/netty/channel/MonoSendMany.java +++ b/reactor-netty-core/src/main/java/reactor/netty/channel/MonoSendMany.java @@ -295,7 +295,7 @@ public void run() { //"FutureReturnValueIgnored" this is deliberate ctx.write(encodedMessage).addListener(this); - if (parent.predicate.test(sourceMessage) || !ctx.channel().isWritable() || readableBytes > ctx.channel().bytesBeforeUnwritable()) { + if (parent.predicate.test(sourceMessage) || readableBytes > ctx.channel().writableBytes()) { needFlush = false; ctx.flush(); }