Skip to content

Commit 583412e

Browse files
committed
Correct static access warnings
1 parent fea2433 commit 583412e

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

rxjava-core/src/main/java/rx/internal/operators/OperatorMerge.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ private void handleScalarSynchronousObservableWithRequestLimits(ScalarSynchronou
185185
if (r > 0) {
186186
emitted = true;
187187
actual.onNext(t.get());
188-
mergeProducer.REQUESTED.decrementAndGet(mergeProducer);
188+
MergeProducer.REQUESTED.decrementAndGet(mergeProducer);
189189
// we handle this Observable without ever incrementing the wip or touching other machinery so just return here
190190
return;
191191
}
@@ -295,7 +295,7 @@ private int drainScalarValueQueue() {
295295
}
296296
}
297297
// decrement the number we emitted from outstanding requests
298-
mergeProducer.REQUESTED.getAndAdd(mergeProducer, -emittedWhileDraining);
298+
MergeProducer.REQUESTED.getAndAdd(mergeProducer, -emittedWhileDraining);
299299
}
300300
return emittedWhileDraining;
301301
}
@@ -500,7 +500,7 @@ private void emit(T t, boolean complete) {
500500
} else {
501501
parentSubscriber.actual.onNext(t);
502502
emitted++;
503-
producer.REQUESTED.decrementAndGet(producer);
503+
MergeProducer.REQUESTED.decrementAndGet(producer);
504504
}
505505
} else {
506506
// no requests available, so enqueue it
@@ -587,7 +587,7 @@ private int drainRequested() {
587587
}
588588

589589
// decrement the number we emitted from outstanding requests
590-
producer.REQUESTED.getAndAdd(producer, -emitted);
590+
MergeProducer.REQUESTED.getAndAdd(producer, -emitted);
591591
return emitted;
592592
}
593593

0 commit comments

Comments
 (0)