From 0450b0c00f61eb40ea39df12d9d7e74ae6ef2185 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 4 Jul 2022 11:23:26 +0200
Subject: [PATCH] [jOOQ/jOOQ#13669] Race conditions also onError()

---
 jOOQ/src/main/java/org/jooq/impl/R2DBC.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/R2DBC.java b/jOOQ/src/main/java/org/jooq/impl/R2DBC.java
index 14f260ed2d..fa4a65bbbe 100644
--- a/jOOQ/src/main/java/org/jooq/impl/R2DBC.java
+++ b/jOOQ/src/main/java/org/jooq/impl/R2DBC.java
@@ -251,7 +251,7 @@ final class R2DBC {
             resultSubscriber.downstream.forwarders.remove(forwarderIndex);
 
             // [#13343] [#13669] Prevent premature completion
-            if (cancelled || resultSubscriber.downstream.forwarders.isEmpty() && resultSubscriber.completionRequested.get())
+            if (resultSubscriber.downstream.forwarders.isEmpty() && resultSubscriber.completionRequested.get())
                 resultSubscriber.complete(cancelled);
         }
     }