summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-07-26 19:19:08 +0100
committerMark Haines <mark.haines@matrix.org>2016-07-26 19:19:08 +0100
commit87ffd21b291a503fd47ba938b32658c9f475aed5 (patch)
tree72b7f1e639261da8527ba10b086afd7e1e4151a3 /synapse/storage
parentMerge pull request #953 from matrix-org/rav/requester (diff)
downloadsynapse-87ffd21b291a503fd47ba938b32658c9f475aed5.tar.xz
Fix a couple of bugs in the transaction and keyring code
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/transactions.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/storage/transactions.py b/synapse/storage/transactions.py
index 6c7481a728..6258ff1725 100644
--- a/synapse/storage/transactions.py
+++ b/synapse/storage/transactions.py
@@ -24,6 +24,7 @@ from collections import namedtuple
 
 import itertools
 import logging
+import ujson as json
 
 logger = logging.getLogger(__name__)
 
@@ -101,7 +102,7 @@ class TransactionStore(SQLBaseStore):
         )
 
         if result and result["response_code"]:
-            return result["response_code"], result["response_json"]
+            return result["response_code"], json.loads(str(result["response_json"]))
         else:
             return None