summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorBrian Waldon <brian.waldon@rackspace.com>2011-07-11 13:16:22 -0400
committerBrian Waldon <brian.waldon@rackspace.com>2011-07-11 13:16:22 -0400
commitad23d0f354b8698b5314ed2a55e5a4d17abffba0 (patch)
tree7ae711dc87a172dd5579fe57f271478b10711cf4 /nova/api
parentac894f7d4dfde9c4d818007e105860661b00fd04 (diff)
downloadnova-ad23d0f354b8698b5314ed2a55e5a4d17abffba0.tar.gz
nova-ad23d0f354b8698b5314ed2a55e5a4d17abffba0.tar.xz
nova-ad23d0f354b8698b5314ed2a55e5a4d17abffba0.zip
allowing controllers to return Nonew
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/wsgi.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/wsgi.py b/nova/api/openstack/wsgi.py
index 9a273bf6e..8eff9e441 100644
--- a/nova/api/openstack/wsgi.py
+++ b/nova/api/openstack/wsgi.py
@@ -427,7 +427,7 @@ class Resource(wsgi.Application):
action_result = self.dispatch(request, action, args)
#TODO(bcwaldon): find a more elegant way to pass through non-dict types
- if type(action_result) is dict:
+ if type(action_result) is dict or action_result is None:
response = self.serializer.serialize(action_result,
accept,
action=action)