summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-05-12 11:54:18 +0100
committerMark Haines <mark.haines@matrix.org>2015-05-12 11:54:18 +0100
commit2551b6645d5d0855f72638d718ceaf365bbb5938 (patch)
tree1308cd68c1ac4e853ba07fa4ea8ced2d502e2016 /synapse
parentMerge branch 'develop' into notifier_unify (diff)
downloadsynapse-2551b6645d5d0855f72638d718ceaf365bbb5938.tar.xz
Update the end_token correctly, otherwise the token doesn't advance and the client gets duplicate events
Diffstat (limited to 'synapse')
-rw-r--r--synapse/notifier.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/notifier.py b/synapse/notifier.py
index abe12b1434..ef7d15671f 100644
--- a/synapse/notifier.py
+++ b/synapse/notifier.py
@@ -311,7 +311,7 @@ class Notifier(object):
                     user, getattr(from_token, keyname), limit,
                 )
                 events.extend(stuff)
-                end_token = from_token.copy_and_replace(keyname, new_key)
+                end_token = end_token.copy_and_replace(keyname, new_key)
 
             if events:
                 defer.returnValue((events, (from_token, end_token)))