diff options
| author | Jakob Odersky <jakob@driver.xyz> | 2017-06-27 15:49:21 -0700 |
|---|---|---|
| committer | Jakob Odersky <jakob@driver.xyz> | 2017-08-02 12:55:24 -0700 |
| commit | f1328134ada77d1c21374f7cca953a376a9b27f9 (patch) | |
| tree | c1cd78d7d59abd29185fa061309a3d9ca6cdf8fc /src/main/scala/xyz/driver/core/file/S3Storage.scala | |
| parent | 59655964902b3c75e8e1f06e2f7d2cf038126fb3 (diff) | |
| download | driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.tar.gz driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.tar.bz2 driver-core-f1328134ada77d1c21374f7cca953a376a9b27f9.zip | |
Library upgrades and code tweaks to support Scala 2.12v0.15.0
Diffstat (limited to 'src/main/scala/xyz/driver/core/file/S3Storage.scala')
| -rw-r--r-- | src/main/scala/xyz/driver/core/file/S3Storage.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/scala/xyz/driver/core/file/S3Storage.scala b/src/main/scala/xyz/driver/core/file/S3Storage.scala index 49bebc8..311aab3 100644 --- a/src/main/scala/xyz/driver/core/file/S3Storage.scala +++ b/src/main/scala/xyz/driver/core/file/S3Storage.scala @@ -43,7 +43,7 @@ class S3Storage(s3: AmazonS3, bucket: Name[Bucket], executionContext: ExecutionC override def stream(filePath: Path): OptionT[Future, Source[ByteString, NotUsed]] = OptionT.optionT(Future { Option(s3.getObject(new GetObjectRequest(bucket.value, filePath.toString))).map { elem => - StreamConverters.fromInputStream(elem.getObjectContent, chunkSize).mapMaterializedValue(_ => NotUsed) + StreamConverters.fromInputStream(() => elem.getObjectContent(), chunkSize).mapMaterializedValue(_ => NotUsed) } }) |