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

=htc #16067 fix Chunked.transformDataBytes' onError/cleanup behavior

Browse source
This commit is contained in:
Johannes Rudolph 2014-10-10 16:40:50 +02:00
parent 13fb925fe9
commit 8906a2fba8
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
akka-http-core/src/main/scala/akka/http/model/HttpEntity.scala
View file

@ -4,8 +4,6 @@
package akka.http.model
import akka.http.util.FastFuture
import language.implicitConversions
import java.io.File
import java.lang.{ Iterable ⇒ JIterable }
@ -265,7 +263,7 @@ object HttpEntity {
sentLastChunk = true
Chunk(byteTransformer.onTermination(None).join) :: l :: Nil
}
override def onError(cause: scala.Throwable): Unit = byteTransformer.onError(cause)
override def onTermination(e: Option[Throwable]): immutable.Seq[ChunkStreamPart] = {
val remaining =
if (e.isEmpty && !sentLastChunk) byteTransformer.onTermination(None)
@ -275,6 +273,8 @@ object HttpEntity {
if (remaining.nonEmpty) Chunk(remaining.join) :: Nil
else Nil
}
override def cleanup(): Unit = byteTransformer.cleanup()
})
HttpEntity.Chunked(contentType, newChunks)