stealthcode
diff --git a/‎src/main/java/io/reactivex/internal/operators/OperatorOnErrorNext.java‎
Lines changed: 14 additions & 0 deletions b/‎src/main/java/io/reactivex/internal/operators/OperatorOnErrorNext.java‎
Lines changed: 14 additions & 0 deletions
diff --git a/‎src/main/java/io/reactivex/internal/operators/OperatorOnErrorReturn.java‎
Lines changed: 18 additions & 17 deletions b/‎src/main/java/io/reactivex/internal/operators/OperatorOnErrorReturn.java‎
Lines changed: 18 additions & 17 deletions
diff --git a/‎src/main/java/io/reactivex/internal/subscriptions/EmptySubscription.java‎
Lines changed: 5 additions & 0 deletions b/‎src/main/java/io/reactivex/internal/subscriptions/EmptySubscription.java‎
Lines changed: 5 additions & 0 deletions
@@ -19,6 +19,7 @@
 
 import io.reactivex.Observable.Operator;
 import io.reactivex.internal.subscriptions.SubscriptionArbiter;
+import io.reactivex.plugins.RxJavaPlugins;
 
 public final class OperatorOnErrorNext<T> implements Operator<T, T> {
     final Function<? super Throwable, ? extends Publisher<? extends T>> nextSupplier;
@@ -44,6 +45,8 @@ static final class OnErrorNextSubscriber<T> implements Subscriber<T> {
 
         boolean once;
 
+        boolean done;
+        
         public OnErrorNextSubscriber(Subscriber<? super T> actual, Function<? super Throwable, ? extends Publisher<? extends T>> nextSupplier, boolean allowFatal) {
             this.actual = actual;
             this.nextSupplier = nextSupplier;
@@ -58,6 +61,9 @@ public void onSubscribe(Subscription s) {
 
         @Override
         public void onNext(T t) {
+            if (done) {
+                return;
+            }
             actual.onNext(t);
             if (!once) {
                 arbiter.produced(1L);
@@ -67,6 +73,10 @@ public void onNext(T t) {
         @Override
         public void onError(Throwable t) {
             if (once) {
+                if (done) {
+                    RxJavaPlugins.onError(t);
+                    return;
+                }
                 actual.onError(t);
                 return;
             }
@@ -99,6 +109,10 @@ public void onError(Throwable t) {
 
         @Override
         public void onComplete() {
+            if (done) {
+                return;
+            }
+            done = true;
             once = true;
             actual.onComplete();
         }
 
@@ -138,27 +138,28 @@ public void request(long n) {
             if (SubscriptionHelper.validateRequest(n)) {
                 return;
             }
-            if (BackpressureHelper.add(this, n) == 0) {
-                if (done) {
-                    for (;;) {
-                        int s = state;
-                        if (s == NO_REQUEST_HAS_VALUE) {
-                            if (STATE.compareAndSet(this, s, HAS_REQUEST_HAS_VALUE)) {
-                                T v = value;
-                                value = null;
-                                actual.onNext(v);
-                                actual.onComplete();
-                                return;
-                            }
-                        } else
-                        if (s == HAS_REQUEST_NO_VALUE || s == HAS_REQUEST_HAS_VALUE) {
-                            return;
-                        } else
-                        if (STATE.compareAndSet(this, s, HAS_REQUEST_NO_VALUE)) {
+            BackpressureHelper.add(this, n);
+            if (done) {
+                for (;;) {
+                    int s = state;
+                    if (s == NO_REQUEST_HAS_VALUE) {
+                        if (STATE.compareAndSet(this, s, HAS_REQUEST_HAS_VALUE)) {
+                            T v = value;
+                            value = null;
+                            actual.onNext(v);
+                            actual.onComplete();
                             return;
                         }
+                    } else
+                    if (s == HAS_REQUEST_NO_VALUE || s == HAS_REQUEST_HAS_VALUE) {
+                        return;
+                    } else
+                    if (STATE.compareAndSet(this, s, HAS_REQUEST_NO_VALUE)) {
+                        return;
                     }
                 }
+            } else {
+                s.request(n);
             }
         }
 
 
@@ -34,6 +34,11 @@ public void cancel() {
         // no-op
     }
 
+    @Override
+    public String toString() {
+        return "EmptySubscription";
+    }
+    
     /**
      * Sets the empty subscription instance on the subscriber and then
      * calls onError with the supplied error.