summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-07 09:34:50 +0100
committerErik Johnston <erik@matrix.org>2016-06-07 09:34:50 +0100
commit310197bab5cf8ed2c26fae522f15f092dbcdff58 (patch)
treeeea9cc3468f64f8608289077febc111f341840c7 /synapse
parentMerge pull request #845 from matrix-org/markjh/synchrotron_presence (diff)
downloadsynapse-310197bab5cf8ed2c26fae522f15f092dbcdff58.tar.xz
Fix AS retries
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/appservice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index ffb7d4a25b..a281571637 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -320,10 +320,10 @@ class ApplicationServiceTransactionStore(SQLBaseStore):
 
         event_ids = json.loads(entry["event_ids"])
 
-        events = yield self.get_events(event_ids)
+        event_map = yield self.get_events(event_ids)
 
         defer.returnValue(AppServiceTransaction(
-            service=service, id=entry["txn_id"], events=events
+            service=service, id=entry["txn_id"], events=event_map.values()
         ))
 
     def _get_oldest_unsent_txn(self, txn, service):