zip - check local boolean before volatile in boolean and (#4764)

davidmoten · akarnokd · commit 039a703be5c0 · 2016-10-25T09:51:47.000+02:00
diff --git a/src/main/java/rx/internal/operators/OperatorZip.java b/src/main/java/rx/internal/operators/OperatorZip.java
@@ -246,7 +246,7 @@ void tick() {
                             }
                         }
                         // we only emit if requested > 0 and have all values available
-                        if (requested.get() > 0 && allHaveValues) {
+                        if (allHaveValues && requested.get() > 0) {
                             try {
                                 // all have something so emit
                                 child.onNext(zipFunction.call(vs));

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ void tick() {`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`	`// we only emit if requested > 0 and have all values available`
`249`		`- if (requested.get() > 0 && allHaveValues) {`
	`249`	`+ if (allHaveValues && requested.get() > 0) {`
`250`	`250`	`try {`
`251`	`251`	`// all have something so emit`
`252`	`252`	`child.onNext(zipFunction.call(vs));`