summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--keystone/middleware/core.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/keystone/middleware/core.py b/keystone/middleware/core.py
index 21e0f624..46d38673 100644
--- a/keystone/middleware/core.py
+++ b/keystone/middleware/core.py
@@ -89,9 +89,13 @@ class JsonBodyMiddleware(wsgi.Middleware):
if not params_json:
return
- params_parsed = json.loads(params_json)
- if not params_parsed:
- params_parsed = {}
+ params_parsed = {}
+ try:
+ params_parsed = json.loads(params_json)
+ finally:
+ if not params_parsed:
+ params_parsed = {}
+
params = {}
for k, v in params_parsed.iteritems():
if k in ('self', 'context'):