raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

fixing post-rebase issues

Browse source
This commit is contained in:
Endre Sándor Varga 2015-06-23 18:53:36 +02:00
parent c7a974dd1e
commit 342a9f2d03
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
akka-stream/src/main/scala/akka/stream/javadsl/Source.scala
View file

@ -266,7 +266,7 @@ class Source[+Out, +Mat](delegate: scaladsl.Source[Out, Mat]) extends Graph[Sour
/**
* Connect this [[Source]] to a [[Sink]], concatenating the processing steps of both.
*/
def toMat[M, M2](sink: Graph[SinkShape[Out], M], combine: function.Function2[Mat, M, M2]): javadsl.RunnableFlow[M2] =
def toMat[M, M2](sink: Graph[SinkShape[Out], M], combine: function.Function2[Mat, M, M2]): javadsl.RunnableGraph[M2] =
new RunnableGraphAdapter(delegate.toMat(sink)(combinerToScala(combine)))
/**