From 86916f432e2c32411f344638630febd6471592fb Mon Sep 17 00:00:00 2001 From: Sungbae Yoo Date: Thu, 7 Jul 2016 14:37:20 +0900 Subject: [PATCH] Krate: Fix bugs that locked zone state can't be got. Change-Id: I87e12908062365c83e41cdbbe5df36d30fb791bf Signed-off-by: Sungbae Yoo --- server/zone/zone.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/zone/zone.cpp b/server/zone/zone.cpp index 357b982..3490ece 100644 --- a/server/zone/zone.cpp +++ b/server/zone/zone.cpp @@ -646,16 +646,16 @@ int ZoneManager::getZoneState(const std::string& name) try { runtime::User user(name); - dbus::Connection& systemDBus = dbus::Connection::getSystem(); - const dbus::Variant& var = systemDBus.methodcall + try { + dbus::Connection& systemDBus = dbus::Connection::getSystem(); + const dbus::Variant& var = systemDBus.methodcall ("org.freedesktop.login1", "/org/freedesktop/login1", "org.freedesktop.login1.Manager", "GetUser", -1, "(o)", "(u)", user.getUid()); - if (var) { return ZoneManager::State::Running; - } else { + } catch (runtime::Exception& e) { return ZoneManager::State::Locked; } } catch (runtime::Exception& e) { -- 2.7.4