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

Merge remote-tracking branch 'pr/19097' into release-2.3-dev

Browse source
This commit is contained in:
Roland Kuhn 2015-12-18 11:51:17 +01:00
commit dcfa56e547
9 changed files with 146 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -195,13 +195,13 @@ object HttpEntity {
def apply(contentType: ContentType, data: Source[ByteString, Any]): HttpEntity.Chunked =
HttpEntity.Chunked.fromData(contentType, data)
/**
* Returns either the empty entity, if the given file is empty, or a [[Default]] entity
* consisting of a stream of [[ByteString]] instances each containing `chunkSize` bytes
* (except for the final ByteString, which simply contains the remaining bytes).
*
* If the given `chunkSize` is -1 the default chunk size is used.
*/
/**
* Returns either the empty entity, if the given file is empty, or a [[Default]] entity
* consisting of a stream of [[ByteString]] instances each containing `chunkSize` bytes
* (except for the final ByteString, which simply contains the remaining bytes).
*
* If the given `chunkSize` is -1 the default chunk size is used.
*/
def apply(contentType: ContentType, file: File, chunkSize: Int = -1): UniversalEntity = {
val fileLength = file.length
if (fileLength > 0)