Support OnSetProducer/Request Changes

benjchristensen · benjchristensen · commit 30a3f2b8c612 · 2014-07-17T14:33:59.000-07:00
diff --git a/rxjava-core/src/main/java/rx/internal/operators/OperatorZip.java b/rxjava-core/src/main/java/rx/internal/operators/OperatorZip.java
@@ -276,7 +276,7 @@ void tick() {
                             }
                             if (emitted > THRESHOLD) {
                                 for (Object obj : observers) {
-                                    ((InnerSubscriber) obj).request(emitted);
+                                    ((InnerSubscriber) obj).requestMore(emitted);
                                 }
                                 emitted = 0;
                             }
@@ -298,6 +298,10 @@ final class InnerSubscriber extends Subscriber {
             public void onStart() {
                 request(RxRingBuffer.SIZE);
             }
+            
+            public void requestMore(long n) {
+                request(n);
+            }
 
             @SuppressWarnings("unchecked")
             @Override

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ void tick() {`
`276`	`276`	`}`
`277`	`277`	`if (emitted > THRESHOLD) {`
`278`	`278`	`for (Object obj : observers) {`
`279`		`- ((InnerSubscriber) obj).request(emitted);`
	`279`	`+ ((InnerSubscriber) obj).requestMore(emitted);`
`280`	`280`	`}`
`281`	`281`	`emitted = 0;`
`282`	`282`	`}`
`@@ -298,6 +298,10 @@ final class InnerSubscriber extends Subscriber {`
`298`	`298`	`public void onStart() {`
`299`	`299`	`request(RxRingBuffer.SIZE);`
`300`	`300`	`}`
	`301`	`+`
	`302`	`+ public void requestMore(long n) {`
	`303`	`+ request(n);`
	`304`	`+ }`
`301`	`305`
`302`	`306`	`@SuppressWarnings("unchecked")`
`303`	`307`	`@Override`