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

=str #19721 Failing FlowConflateSpec and NPE in Batch fixed

Browse source
This commit is contained in:
Johan Andrén 2016-02-09 09:23:06 +01:00
parent 9880ad2678
commit 300ac802a0
3 changed files with 40 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-stream/src/main/scala/akka/stream/impl/fusing/Ops.scala
View file

@ -452,8 +452,10 @@ private[akka] final case class Batch[In, Out](max: Long, costFn: In ⇒ Long, se
private var pending: In = null.asInstanceOf[In]
private def flush(): Unit = {
push(out, agg)
left = max
if (agg != null) {
push(out, agg)
left = max
}
if (pending != null) {
try {
agg = seed(pending)