diff options
| author | Erik Johnston <erik@matrix.org> | 2017-03-28 10:41:08 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-03-30 14:14:36 +0100 |
| commit | 86780a8bc3eac566d2c03a601f84b5ccf5737ceb (patch) | |
| tree | 196cf1307a234245d4d1642509f64a2f98c09ca5 /synapse/util/async.py | |
| parent | Fix the logcontext handling in the cache wrappers (#2077) (diff) | |
| download | synapse-86780a8bc3eac566d2c03a601f84b5ccf5737ceb.tar.xz | |
Don't convert to deferreds when not necessary
Diffstat (limited to 'synapse/util/async.py')
| -rw-r--r-- | synapse/util/async.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/util/async.py b/synapse/util/async.py index 35380bf8ed..8495de496a 100644 --- a/synapse/util/async.py +++ b/synapse/util/async.py @@ -101,7 +101,7 @@ class ObservableDeferred(object): return d else: success, res = self._result - return defer.succeed(res) if success else defer.fail(res) + return res if success else defer.fail(res) def observers(self): return self._observers |