From: Brian Warner Date: Tue, 12 Jun 2012 01:16:02 +0000 (-0700) Subject: offloaded.py: don't drop the Deferred X-Git-Url: https://git.rkrishnan.org/components/%22news.html/...?a=commitdiff_plain;h=a809e4cababc385bf2807c973c7b66214326a7ae;p=tahoe-lafs%2Ftahoe-lafs.git offloaded.py: don't drop the Deferred There was one corner case (where the client disconnects at just the wrong time) that could have dropped a Deferred, leading to an Unhandled Error. Clean up the control flow to avoid this case. --- diff --git a/src/allmydata/immutable/offloaded.py b/src/allmydata/immutable/offloaded.py index 20a4fd7c..5365bad4 100644 --- a/src/allmydata/immutable/offloaded.py +++ b/src/allmydata/immutable/offloaded.py @@ -325,14 +325,12 @@ class CHKCiphertextFetcher(AskUntilSuccessMixin): # else. have = os.stat(self._encoding_file)[stat.ST_SIZE] d = self.call("read_encrypted", have-1, 1) - d.addCallback(self._done2, started) - return - - # first, find out how large the file is going to be - d = self.call("get_size") - d.addCallback(self._got_size) - d.addCallback(self._start_reading) - d.addCallback(self._done) + else: + # first, find out how large the file is going to be + d = self.call("get_size") + d.addCallback(self._got_size) + d.addCallback(self._start_reading) + d.addCallback(self._done) d.addCallback(self._done2, started) d.addErrback(self._failed)