From 3fa1de9e71fb46b23e5508560343f18090584049 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Sun, 4 Oct 2015 08:40:13 -0400 Subject: [PATCH] +str #18411 add FlowOps.zip/zipWith/merge/concat operators --- akka-stream/src/main/scala/akka/stream/javadsl/Source.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala index 8a775cd18b..0e17fc9e72 100644 --- a/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala +++ b/akka-stream/src/main/scala/akka/stream/javadsl/Source.scala @@ -377,7 +377,7 @@ class Source[+Out, +Mat](delegate: scaladsl.Source[Out, Mat]) extends Graph[Sour * '''Cancels when''' downstream cancels */ def zip[T](that: Graph[SourceShape[T], _]): javadsl.Source[Out @uncheckedVariance Pair T, Mat] = - zipMat(that, combinerToJava((a: Mat, b: Any) ⇒ a)) + zipMat(that, Keep.left) /** * Combine the elements of current [[Source]] and the given one into a stream of tuples.