summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-12-20 07:47:33 +0000
committerGerrit Code Review <review@openstack.org>2017-12-20 07:47:33 +0000
commitb722df34191401b22788fa043e8aaefca1cf8753 (patch)
tree4aaa2e263a599aad5b7ba0909eb3105372baa691
parentde3be5443729ccba3e4ca9da74eeccdb2508b8e3 (diff)
parent3e5c72f54e44231d165dcb02eccece70a0ddf7ec (diff)
downloadglance_store-b722df34191401b22788fa043e8aaefca1cf8753.tar.gz
Merge "Fix BufferedReader writing zero size chunks"
-rw-r--r--glance_store/_drivers/swift/buffered.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/glance_store/_drivers/swift/buffered.py b/glance_store/_drivers/swift/buffered.py
index fd35d3b..02c0594 100644
--- a/glance_store/_drivers/swift/buffered.py
+++ b/glance_store/_drivers/swift/buffered.py
@@ -102,7 +102,7 @@ class BufferedReader(object):
self._tmpfile = tempfile.TemporaryFile(dir=buffer_dir)
self._buffered = False
- self.is_zero_size = True
+ self.is_zero_size = False
self._buffer()
# Setting the file pointer back to the beginning of file
self._tmpfile.seek(0)
@@ -142,7 +142,7 @@ class BufferedReader(object):
if len(buf) == 0:
self._tmpfile.seek(0)
self._buffered = True
- self.is_zero_size = False
+ self.is_zero_size = True
break
self._tmpfile.write(buf)
to_buffer -= len(buf)