Avoid request(0) to trigger a recursive call.

ReactiveX · Nov 19, 2014 · 752c2a7 · 752c2a7
1 parent 3c46285
commit 752c2a7
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/rx/internal/operators/OperatorMerge.java b/src/main/java/rx/internal/operators/OperatorMerge.java
@@ -307,7 +307,9 @@ private boolean drainQueuesIfNeeded() {
                     } finally {
                         boolean moreToDrain = releaseEmitLock();
                         // request outside of lock
-                        request(emitted);
+                        if (emitted > 0) {
+                            request(emitted);
+                        }
                         if (!moreToDrain) {
                             return true;
                         }
@@ -524,6 +526,7 @@ private static final class InnerSubscriber<T> extends Subscriber<T> {
         final MergeSubscriber<T> parentSubscriber;
         final MergeProducer<T> producer;
         /** Make sure the inner termination events are delivered only once. */
+        @SuppressWarnings("unused")
         volatile int terminated;
         @SuppressWarnings("rawtypes")
         static final AtomicIntegerFieldUpdater<InnerSubscriber> ONCE_TERMINATED = AtomicIntegerFieldUpdater.newUpdater(InnerSubscriber.class, "terminated");