From 3ef3dfc2f6c8b9cc14119793df4990432ff74ea2 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Tue, 22 Feb 2011 18:42:23 -0800
Subject: Return null if no kernel_id / ramdisk_id

---
 nova/api/openstack/servers.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 41b05cbb4..d83bd34ab 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -151,6 +151,7 @@ class Controller(wsgi.Controller):
                 LOG.debug(
                     _("%(param)s property not found for image %(_image_id)s") %
                       locals())
+            return None
 
         image_id = str(image_id)
         image = self._image_service.show(req.environ['nova.context'], image_id)
-- 
cgit