diff options
| author | vlad <vlad@driver.xyz> | 2017-08-01 23:21:46 -0700 |
|---|---|---|
| committer | vlad <vlad@driver.xyz> | 2017-08-01 23:21:46 -0700 |
| commit | a1e2e7b9ed43a8a0757a4c678ea855d97f1a16c8 (patch) | |
| tree | 2523592669a2a8201d490cc46ae30a2221c2fd36 /src/main/scala/xyz/driver/core/file | |
| parent | c6d32c5d4296e7447f0e5bb2da921e04fb23a90b (diff) | |
| parent | 59655964902b3c75e8e1f06e2f7d2cf038126fb3 (diff) | |
| download | driver-core-a1e2e7b9ed43a8a0757a4c678ea855d97f1a16c8.tar.gz driver-core-a1e2e7b9ed43a8a0757a4c678ea855d97f1a16c8.tar.bz2 driver-core-a1e2e7b9ed43a8a0757a4c678ea855d97f1a16c8.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src/main/scala/xyz/driver/core/file')
| -rw-r--r-- | src/main/scala/xyz/driver/core/file/GcsStorage.scala | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/scala/xyz/driver/core/file/GcsStorage.scala b/src/main/scala/xyz/driver/core/file/GcsStorage.scala index 4ceab79..65a5a50 100644 --- a/src/main/scala/xyz/driver/core/file/GcsStorage.scala +++ b/src/main/scala/xyz/driver/core/file/GcsStorage.scala @@ -62,6 +62,7 @@ class GcsStorage(storageClient: Storage, val buffer = ByteBuffer.allocate(chunkSize) val length = rc.read(buffer) if (length > 0) { + buffer.flip() Some(ByteString.fromByteBuffer(buffer)) } else { None @@ -100,8 +101,8 @@ class GcsStorage(storageClient: Storage, val size = Option(blob.getSize).getOrElse(nullError("a size")) FileLink( - Name(name), - Paths.get(path.toString, name), + Name(name.split('/').last), + Paths.get(name), Revision(generation.toString), Time(updateTime), size |