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(); }