Updated Branches: refs/heads/javelin 1567a112f -> e5b23e387
AccountManagerImpl: Fix method to check and return systemuser, spring injection failsafe Signed-off-by: Rohit Yadav <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e5b23e38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e5b23e38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e5b23e38 Branch: refs/heads/javelin Commit: e5b23e387d5f41b1a780c781fcbfc87d69f4133f Parents: 753b884 Author: Rohit Yadav <[email protected]> Authored: Thu Jan 24 15:41:04 2013 -0800 Committer: Rohit Yadav <[email protected]> Committed: Thu Jan 24 15:41:04 2013 -0800 ---------------------------------------------------------------------- server/src/com/cloud/user/AccountManagerImpl.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e5b23e38/server/src/com/cloud/user/AccountManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/user/AccountManagerImpl.java b/server/src/com/cloud/user/AccountManagerImpl.java index 379f7fb..09cd8df 100755 --- a/server/src/com/cloud/user/AccountManagerImpl.java +++ b/server/src/com/cloud/user/AccountManagerImpl.java @@ -262,6 +262,9 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag @Override public UserVO getSystemUser() { + if (_systemUser == null) { + _systemUser = _userDao.findById(User.UID_SYSTEM); + } return _systemUser; }
