From 804a9336e3ccb41f3f6415db30cb15ecf59cf1f8 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 6 Oct 2014 15:40:19 +0200 Subject: [PATCH] bug #2875: sunstone server crashes if oned is stopped while a sunstone session is active --- src/sunstone/models/SunstoneViews.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/sunstone/models/SunstoneViews.rb b/src/sunstone/models/SunstoneViews.rb index 27da623039..34ff6f64ef 100644 --- a/src/sunstone/models/SunstoneViews.rb +++ b/src/sunstone/models/SunstoneViews.rb @@ -65,14 +65,20 @@ class SunstoneViews onec = $cloud_auth.client(user_name) user = OpenNebula::User.new_with_id(OpenNebula::User::SELF, onec) - user.info - available = Array.new + rc = user.info + if OpenNebula.is_error?(rc) + return available + end + user.groups.each { |gid| group = OpenNebula::Group.new_with_id(gid, onec) - group.info + rc = group.info + if OpenNebula.is_error?(rc) + return available.uniq + end if group["TEMPLATE/SUNSTONE_VIEWS"] views_array = group["TEMPLATE/SUNSTONE_VIEWS"].split(",")