File tree Expand file tree Collapse file tree 1 file changed +4
-1
lines changed
src/main/java/rx/internal/operators Expand file tree Collapse file tree 1 file changed +4
-1
lines changed Original file line number Diff line number Diff line change @@ -307,7 +307,9 @@ private boolean drainQueuesIfNeeded() {
307
307
} finally {
308
308
boolean moreToDrain = releaseEmitLock ();
309
309
// request outside of lock
310
- request (emitted );
310
+ if (emitted > 0 ) {
311
+ request (emitted );
312
+ }
311
313
if (!moreToDrain ) {
312
314
return true ;
313
315
}
@@ -524,6 +526,7 @@ private static final class InnerSubscriber<T> extends Subscriber<T> {
524
526
final MergeSubscriber <T > parentSubscriber ;
525
527
final MergeProducer <T > producer ;
526
528
/** Make sure the inner termination events are delivered only once. */
529
+ @ SuppressWarnings ("unused" )
527
530
volatile int terminated ;
528
531
@ SuppressWarnings ("rawtypes" )
529
532
static final AtomicIntegerFieldUpdater <InnerSubscriber > ONCE_TERMINATED = AtomicIntegerFieldUpdater .newUpdater (InnerSubscriber .class , "terminated" );
You can’t perform that action at this time.
0 commit comments