Skip to content

Commit 70d4407

Browse files
vanniktechakarnokd
authored andcommitted
2.x: Remove some unused fields (#4754)
1 parent f79625a commit 70d4407

File tree

4 files changed

+1
-16
lines changed

4 files changed

+1
-16
lines changed

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ public final class BlockingFlowableIterator<T>
4545
volatile boolean done;
4646
Throwable error;
4747

48-
volatile boolean cancelled;
49-
5048
public BlockingFlowableIterator(int batchSize) {
5149
this.queue = new SpscLinkedArrayQueue<T>(batchSize);
5250
this.batchSize = batchSize;
@@ -58,9 +56,6 @@ public BlockingFlowableIterator(int batchSize) {
5856
@Override
5957
public boolean hasNext() {
6058
for (;;) {
61-
if (cancelled) {
62-
return false;
63-
}
6459
boolean d = done;
6560
boolean empty = queue.isEmpty();
6661
if (d) {
@@ -75,7 +70,7 @@ public boolean hasNext() {
7570
if (empty) {
7671
lock.lock();
7772
try {
78-
while (!cancelled && !done && queue.isEmpty()) {
73+
while (!done && queue.isEmpty()) {
7974
condition.await();
8075
}
8176
} catch (InterruptedException ex) {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,6 @@ static final class DistinctSubscriber<T, K> extends BasicFuseableSubscriber<T, T
6060

6161
final Function<? super T, K> keySelector;
6262

63-
Disposable d;
64-
65-
SimpleQueue<T> queue;
66-
6763
DistinctSubscriber(Subscriber<? super T> actual, Function<? super T, K> keySelector, Collection<? super K> collection) {
6864
super(actual);
6965
this.keySelector = keySelector;

src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,6 @@ static final class DistinctObserver<T, K> extends BasicFuseableObserver<T, T> {
5959

6060
final Function<? super T, K> keySelector;
6161

62-
Disposable d;
63-
64-
SimpleQueue<T> queue;
65-
6662
DistinctObserver(Observer<? super T> actual, Function<? super T, K> keySelector, Collection<? super K> collection) {
6763
super(actual);
6864
this.keySelector = keySelector;

src/main/java/io/reactivex/internal/operators/observable/ObservableFilter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ public void subscribeActual(Observer<? super T> s) {
3333
static final class FilterObserver<T> extends BasicFuseableObserver<T, T> {
3434
final Predicate<? super T> filter;
3535

36-
Disposable s;
37-
3836
FilterObserver(Observer<? super T> actual, Predicate<? super T> filter) {
3937
super(actual);
4038
this.filter = filter;

0 commit comments

Comments
 (0)