Merge pull request #2875 from akarnokd/ConcatNPEFix

Fix: NPE in requestFromChild method.
ReactiveX · Apr 14, 2015 · 131a663 · 131a663
2 parents 135477e + f8373d3
commit 131a663
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/java/rx/internal/operators/OperatorConcat.java b/src/main/java/rx/internal/operators/OperatorConcat.java
@@ -114,8 +114,9 @@ public void onStart() {
 
         private void requestFromChild(long n) {
             // we track 'requested' so we know whether we should subscribe the next or not
+            ConcatInnerSubscriber<T> actualSubscriber = currentSubscriber;
             if (REQUESTED_UPDATER.getAndAdd(this, n) == 0) {
-                if (currentSubscriber == null && wip > 0) {
+                if (actualSubscriber == null && wip > 0) {
                     // this means we may be moving from one subscriber to another after having stopped processing
                     // so need to kick off the subscribe via this request notification
                     subscribeNext();
@@ -124,9 +125,9 @@ private void requestFromChild(long n) {
                 }
             } 
 
-            if (currentSubscriber != null) {
+            if (actualSubscriber != null) {
                 // otherwise we are just passing it through to the currentSubscriber
-                currentSubscriber.requestMore(n);
+                actualSubscriber.requestMore(n);
             }
         }