You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/09 03:41:08 UTC
[5/23] git commit: Reverted "Initialize user context from
AccountManager" committed to master branch by mistake
Reverted "Initialize user context from AccountManager" committed to master branch by mistake
This reverts commit da26302049f48839dc364eefd32cd5597ac05bdc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a1f36190
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a1f36190
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a1f36190
Branch: refs/heads/vpc
Commit: a1f361904e43e60c99a95fbf00f203d10dfbff3b
Parents: d91b7dc
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Wed Aug 8 15:26:45 2012 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Wed Aug 8 15:26:45 2012 -0700
----------------------------------------------------------------------
api/src/com/cloud/user/UserContext.java | 15 +++++++--------
server/src/com/cloud/user/AccountManagerImpl.java | 3 ---
2 files changed, 7 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a1f36190/api/src/com/cloud/user/UserContext.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/user/UserContext.java b/api/src/com/cloud/user/UserContext.java
index ed33e88..b140728 100644
--- a/api/src/com/cloud/user/UserContext.java
+++ b/api/src/com/cloud/user/UserContext.java
@@ -16,11 +16,14 @@
// under the License.
package com.cloud.user;
+import com.cloud.server.ManagementService;
+import com.cloud.utils.component.ComponentLocator;
public class UserContext {
private static ThreadLocal<UserContext> s_currentContext = new ThreadLocal<UserContext>();
- private static UserContext s_adminContext = null;
+ private static final ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name);
+ private static final AccountService _accountMgr = locator.getManager(AccountService.class);
private long userId;
private String sessionId;
@@ -30,7 +33,9 @@ public class UserContext {
private String eventDetails;
private boolean apiServer;
-
+
+ private static UserContext s_adminContext = new UserContext(_accountMgr.getSystemUser().getId(), _accountMgr.getSystemAccount(), null, false);
+
public UserContext() {
}
@@ -129,10 +134,4 @@ public class UserContext {
public String getEventDetails() {
return eventDetails;
}
-
- public static synchronized void setAdminContext(UserContext adminContext) {
- if (adminContext == null) {
- UserContext.s_adminContext = adminContext;
- }
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a1f36190/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 1631482..0a11dc4 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -239,9 +239,6 @@ public class AccountManagerImpl implements AccountManager, AccountService, Manag
if (_userAuthenticators == null || !_userAuthenticators.isSet()) {
s_logger.error("Unable to find an user authenticator.");
}
-
- //initialize admin context
- UserContext.setAdminContext(new UserContext(getSystemUser().getId(), getSystemAccount(), null, false));
return true;
}