diff options
| author | Erik Johnston <erik@matrix.org> | 2015-07-08 15:37:33 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-07-08 15:37:33 +0100 |
| commit | 304343f4d7502d65ff7977df466209ef4702b90c (patch) | |
| tree | 0eb1002013d40ef65dcd82e630859c467b3e6ec7 /synapse/storage | |
| parent | Add a cache to fetching of receipt streams (diff) | |
| parent | Merge pull request #197 from matrix-org/mjark/missing_regex_group (diff) | |
| download | synapse-304343f4d7502d65ff7977df466209ef4702b90c.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/receipts
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/event_federation.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/storage/event_federation.py b/synapse/storage/event_federation.py index ace7459538..c71019d93b 100644 --- a/synapse/storage/event_federation.py +++ b/synapse/storage/event_federation.py @@ -408,10 +408,12 @@ class EventFederationStore(SQLBaseStore): keyvalues={ "event_id": event_id, }, - retcol="depth" + retcol="depth", + allow_none=True, ) - queue.put((-depth, event_id)) + if depth: + queue.put((-depth, event_id)) while not queue.empty() and len(event_results) < limit: try: |