summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-09-12 13:25:23 +0100
committerGitHub <noreply@github.com>2016-09-12 13:25:23 +0100
commitaa7b890cfeef6d202f8381db8779a0024d2325d9 (patch)
tree98c66992d8f51a9b3abc9bc8506200743b355759
parentMerge pull request #1103 from matrix-org/markjh/comment_on_create_index (diff)
parentFix direct to device messages recieved over federation to notify sync (diff)
downloadsynapse-aa7b890cfeef6d202f8381db8779a0024d2325d9.tar.xz
Merge pull request #1104 from matrix-org/markjh/direct_to_device_federation_sync
Fix direct to device messages recieved over federation to notify sync
-rw-r--r--synapse/storage/deviceinbox.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/storage/deviceinbox.py b/synapse/storage/deviceinbox.py
index b729b7106e..f640e73714 100644
--- a/synapse/storage/deviceinbox.py
+++ b/synapse/storage/deviceinbox.py
@@ -128,6 +128,8 @@ class DeviceInboxStore(SQLBaseStore):
                     user_id, stream_id
                 )
 
+        defer.returnValue(stream_id)
+
     def _add_messages_to_local_device_inbox_txn(self, txn, stream_id,
                                                 messages_by_user_then_device):
         sql = (