Fix #508 FlattenIterableSubscriber.isEmpty check (#509)

- returned true from isEmpty when iterator had more elements
reactor · Apr 1, 2017 · ab79b24 · ab79b24
1 parent 575de72
commit ab79b24
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/reactor/core/publisher/FluxFlattenIterable.java b/src/main/java/reactor/core/publisher/FluxFlattenIterable.java
@@ -627,7 +627,7 @@ public void clear() {
 		public boolean isEmpty() {
 			Iterator<? extends R> it = current;
 			if (it != null) {
-				return it.hasNext();
+				return !it.hasNext();
 			}
 			return queue.isEmpty(); // estimate
 		}

diff --git a/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java b/src/test/java/reactor/core/publisher/FluxFlattenIterableTest.java
@@ -313,4 +313,18 @@ public void testDrainAsyncCompletesSeveralBatches() {
 		            .verifyComplete();
 	}
 
+	/**
+	 * See https://github.com/reactor/reactor-core/issues/508
+	 */
+	@Test
+	public void testPublishingTwice() {
+		StepVerifier.create(Flux.just(Flux.range(0, 300).toIterable(), Flux.range(0, 300).toIterable())
+				.flatMapIterable(x -> x)
+				.share()
+				.share()
+				.count())
+				.expectNext(600L)
+				.verifyComplete();
+	}
+
 }