diff options
| author | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-02-10 14:12:48 +0000 |
| commit | e66d0bd03abc75b5a0445acadc776ba23e1090ba (patch) | |
| tree | d73f7c0c2621a27c1637223213a930e40140728d /synapse/util/caches/snapshot_cache.py | |
| parent | Update CHANGES (diff) | |
| parent | Merge pull request #569 from matrix-org/erikj/initial_sync (diff) | |
| download | synapse-e66d0bd03abc75b5a0445acadc776ba23e1090ba.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.13.0
Diffstat (limited to 'synapse/util/caches/snapshot_cache.py')
| -rw-r--r-- | synapse/util/caches/snapshot_cache.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/util/caches/snapshot_cache.py b/synapse/util/caches/snapshot_cache.py index b1e40417fd..d03678b8c8 100644 --- a/synapse/util/caches/snapshot_cache.py +++ b/synapse/util/caches/snapshot_cache.py @@ -87,7 +87,8 @@ class SnapshotCache(object): # expire from the rotation of that cache. self.next_result_cache[key] = result self.pending_result_cache.pop(key, None) + return r - result.observe().addBoth(shuffle_along) + result.addBoth(shuffle_along) return result.observe() |