diff --git a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcat.java b/src/main/java/io/reactivex/internal/operators/completable/CompletableConcat.java index b6c66068e0..5eb5e5b847 100644 --- a/src/main/java/io/reactivex/internal/operators/completable/CompletableConcat.java +++ b/src/main/java/io/reactivex/internal/operators/completable/CompletableConcat.java @@ -20,7 +20,6 @@ import io.reactivex.*; import io.reactivex.disposables.*; import io.reactivex.exceptions.MissingBackpressureException; -import io.reactivex.internal.disposables.SerialResource; import io.reactivex.internal.queue.SpscArrayQueue; import io.reactivex.internal.subscriptions.SubscriptionHelper; import io.reactivex.plugins.RxJavaPlugins; @@ -47,7 +46,7 @@ static final class CompletableConcatSubscriber private static final long serialVersionUID = 7412667182931235013L; final CompletableSubscriber actual; final int prefetch; - final SerialResource sr; + final SerialDisposable sd; final SpscArrayQueue queue; @@ -63,7 +62,7 @@ public CompletableConcatSubscriber(CompletableSubscriber actual, int prefetch) { this.actual = actual; this.prefetch = prefetch; this.queue = new SpscArrayQueue(prefetch); - this.sr = new SerialResource(Disposables.consumeAndDispose()); + this.sd = new SerialDisposable(); this.inner = new ConcatInnerSubscriber(); } @@ -125,7 +124,7 @@ void innerComplete() { @Override public void dispose() { s.cancel(); - sr.dispose(); + sd.dispose(); } void next() { @@ -148,7 +147,7 @@ void next() { final class ConcatInnerSubscriber implements CompletableSubscriber { @Override public void onSubscribe(Disposable d) { - sr.set(d); + sd.set(d); } @Override