diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-07-24 14:11:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-24 14:11:45 +0100 |
| commit | a321f78991b0d9b4f410b111a9e005c289ec8302 (patch) | |
| tree | 0c346f8b30059af3764978fd073dcd48d2027ed7 /synapse/events/snapshot.py | |
| parent | Merge pull request #3583 from matrix-org/rav/remove_who_forgot_in_room (diff) | |
| parent | Handle delta_ids being None in _update_context_for_auth_events (diff) | |
| download | synapse-a321f78991b0d9b4f410b111a9e005c289ec8302.tar.xz | |
Merge pull request #3586 from matrix-org/rav/optimise_resolve_state_groups
Fixes and optimisations for resolve_state_groups
Diffstat (limited to 'synapse/events/snapshot.py')
| -rw-r--r-- | synapse/events/snapshot.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/events/snapshot.py b/synapse/events/snapshot.py index 189212b0fa..368b5f6ae4 100644 --- a/synapse/events/snapshot.py +++ b/synapse/events/snapshot.py @@ -249,7 +249,7 @@ class EventContext(object): @defer.inlineCallbacks def update_state(self, state_group, prev_state_ids, current_state_ids, - delta_ids): + prev_group, delta_ids): """Replace the state in the context """ @@ -260,6 +260,7 @@ class EventContext(object): self.state_group = state_group self._prev_state_ids = prev_state_ids + self.prev_group = prev_group self._current_state_ids = current_state_ids self.delta_ids = delta_ids |