Skip to content

Commit 7849fc9

Browse files
artem-zinnatullinakarnokd
authored andcommitted
Inline SubscriptionHelper.isCancelled() (#6263)
1 parent 1a774e6 commit 7849fc9

12 files changed

+12
-20
lines changed

src/main/java/io/reactivex/internal/operators/flowable/BlockingFlowableIterable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ public void dispose() {
179179

180180
@Override
181181
public boolean isDisposed() {
182-
return SubscriptionHelper.isCancelled(get());
182+
return get() == SubscriptionHelper.CANCELLED;
183183
}
184184
}
185185
}

src/main/java/io/reactivex/internal/operators/flowable/FlowableGroupJoin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,7 @@ public void dispose() {
411411

412412
@Override
413413
public boolean isDisposed() {
414-
return SubscriptionHelper.isCancelled(get());
414+
return get() == SubscriptionHelper.CANCELLED;
415415
}
416416

417417
@Override
@@ -462,7 +462,7 @@ public void dispose() {
462462

463463
@Override
464464
public boolean isDisposed() {
465-
return SubscriptionHelper.isCancelled(get());
465+
return get() == SubscriptionHelper.CANCELLED;
466466
}
467467

468468
@Override

src/main/java/io/reactivex/internal/operators/flowable/FlowablePublishMulticast.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public void dispose() {
205205

206206
@Override
207207
public boolean isDisposed() {
208-
return SubscriptionHelper.isCancelled(upstream.get());
208+
return upstream.get() == SubscriptionHelper.CANCELLED;
209209
}
210210

211211
@Override

src/main/java/io/reactivex/internal/operators/flowable/FlowableRepeatWhen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void onSubscribe(Subscription s) {
9393
public void onNext(Object t) {
9494
if (getAndIncrement() == 0) {
9595
for (;;) {
96-
if (SubscriptionHelper.isCancelled(upstream.get())) {
96+
if (upstream.get() == SubscriptionHelper.CANCELLED) {
9797
return;
9898
}
9999

src/main/java/io/reactivex/internal/operators/flowable/FlowableSequenceEqualSingle.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public void dispose() {
9898

9999
@Override
100100
public boolean isDisposed() {
101-
return SubscriptionHelper.isCancelled(first.get());
101+
return first.get() == SubscriptionHelper.CANCELLED;
102102
}
103103

104104
void cancelAndClear() {

src/main/java/io/reactivex/internal/operators/flowable/FlowableTimeout.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public void dispose() {
382382

383383
@Override
384384
public boolean isDisposed() {
385-
return SubscriptionHelper.isCancelled(this.get());
385+
return this.get() == SubscriptionHelper.CANCELLED;
386386
}
387387
}
388388

src/main/java/io/reactivex/internal/operators/flowable/FlowableWithLatestFromMany.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ void subscribe(Publisher<?>[] others, int n) {
133133
WithLatestInnerSubscriber[] subscribers = this.subscribers;
134134
AtomicReference<Subscription> upstream = this.upstream;
135135
for (int i = 0; i < n; i++) {
136-
if (SubscriptionHelper.isCancelled(upstream.get())) {
136+
if (upstream.get() == SubscriptionHelper.CANCELLED) {
137137
return;
138138
}
139139
others[i].subscribe(subscribers[i]);

src/main/java/io/reactivex/internal/operators/maybe/MaybeDelayOtherPublisher.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public void dispose() {
6565

6666
@Override
6767
public boolean isDisposed() {
68-
return SubscriptionHelper.isCancelled(other.get());
68+
return other.get() == SubscriptionHelper.CANCELLED;
6969
}
7070

7171
@Override

src/main/java/io/reactivex/internal/subscribers/ForEachWhileSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,6 @@ public void dispose() {
108108

109109
@Override
110110
public boolean isDisposed() {
111-
return SubscriptionHelper.isCancelled(this.get());
111+
return this.get() == SubscriptionHelper.CANCELLED;
112112
}
113113
}

src/main/java/io/reactivex/internal/subscribers/FutureSubscriber.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public boolean cancel(boolean mayInterruptIfRunning) {
6565

6666
@Override
6767
public boolean isCancelled() {
68-
return SubscriptionHelper.isCancelled(upstream.get());
68+
return upstream.get() == SubscriptionHelper.CANCELLED;
6969
}
7070

7171
@Override

0 commit comments

Comments
 (0)