From ef3d8754f51e38375dc8d5144d2224d5e86ce458 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 14 May 2015 15:41:55 +0100
Subject: Call from right thread

---
 synapse/storage/events.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'synapse/storage/events.py')

diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index a6b2e7677f..59af21a2ca 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -513,6 +513,7 @@ class EventsStore(SQLBaseStore):
                         self._event_fetch_list = []
 
                         if not event_list:
+                            self._event_fetch_ongoing -= 1
                             return
 
                     event_id_lists = zip(*event_list)[0]
@@ -527,7 +528,8 @@ class EventsStore(SQLBaseStore):
                     }
 
                     for ids, d in event_list:
-                        d.callback(
+                        reactor.callFromThread(
+                            d.callback,
                             [
                                 row_dict[i] for i in ids
                                 if i in row_dict
-- 
cgit 1.4.1