+str #18411 add FlowOps.zip/zipWith/merge/concat operators

2015-10-04 08:40:13 -04:00 · 2015-10-04 08:40:13 -04:00 · 3fa1de9e71
commit 3fa1de9e71
parent c8428a1bc3
1 changed files with 1 additions and 1 deletions
--- 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.