From 5246ee474ceaf1567329096178ae1f686d8bcb8c Mon Sep 17 00:00:00 2001
From: Chintan Doshi <chintan.doshi@snap.com>
Date: Fri, 23 Jun 2023 10:19:25 -0700
Subject: [PATCH 1/3] pass predicate to avoid holding reference

---
 .../operators/completable/CompletableOnErrorComplete.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
index bebb401e48..53171787d7 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
@@ -38,9 +38,12 @@ protected void subscribeActual(final CompletableObserver observer) {
     final class OnError implements CompletableObserver {
 
         private final CompletableObserver downstream;
+        private final Predicate<? super Throwable> predicate;
 
-        OnError(CompletableObserver observer) {
+        OnError(CompletableObserver observer,
+                Predicate<? super Throwable> predicate) {
             this.downstream = observer;
+            this.predicate = predicate;
         }
 
         @Override

From 1c2437c3260375569b1702557c4d86f65b1572ab Mon Sep 17 00:00:00 2001
From: Chintan Doshi <chintan.doshi@snap.com>
Date: Fri, 23 Jun 2023 10:20:12 -0700
Subject: [PATCH 2/3] static

---
 .../operators/completable/CompletableOnErrorComplete.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
index 53171787d7..1a1157d6b2 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
@@ -35,7 +35,7 @@ protected void subscribeActual(final CompletableObserver observer) {
         source.subscribe(new OnError(observer));
     }
 
-    final class OnError implements CompletableObserver {
+    static final class OnError implements CompletableObserver {
 
         private final CompletableObserver downstream;
         private final Predicate<? super Throwable> predicate;

From dceb8d0ce3e85094c636cca13fe05ab90239319a Mon Sep 17 00:00:00 2001
From: Chintan Doshi <chintan.doshi@snap.com>
Date: Fri, 23 Jun 2023 10:28:13 -0700
Subject: [PATCH 3/3] fix compile error

---
 .../operators/completable/CompletableOnErrorComplete.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
index 1a1157d6b2..c4252e7f3b 100644
--- a/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
+++ b/src/main/java/io/reactivex/rxjava3/internal/operators/completable/CompletableOnErrorComplete.java
@@ -32,7 +32,7 @@ public CompletableOnErrorComplete(CompletableSource source, Predicate<? super Th
     @Override
     protected void subscribeActual(final CompletableObserver observer) {
 
-        source.subscribe(new OnError(observer));
+        source.subscribe(new OnError(observer, predicate));
     }
 
     static final class OnError implements CompletableObserver {