diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-23 22:06:50 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-23 22:06:50 +0100 |
| commit | c1f80effbe17b1572161cc50838e60b495fb45a4 (patch) | |
| tree | 6fb07f0506eec36f82f30301be09024e4edfd331 /synapse/events/snapshot.py | |
| parent | newsfile (diff) | |
| download | synapse-c1f80effbe17b1572161cc50838e60b495fb45a4.tar.xz | |
Handle delta_ids being None in _update_context_for_auth_events
it's easier to create the new state group as a delta from the existing one. (There's an outside chance this will help with https://github.com/matrix-org/synapse/issues/3364)
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 |