cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject git commit: Fixed UserContext initialization - got broken by unittest
Date Tue, 07 Aug 2012 19:12:25 GMT
Updated Branches:
  refs/heads/vpc 95449da4b -> 629556c70


Fixed UserContext initialization - got broken by unittest


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/629556c7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/629556c7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/629556c7

Branch: refs/heads/vpc
Commit: 629556c708a731a994ffb20a4e7189313c7b4196
Parents: 95449da
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Tue Aug 7 11:50:26 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Tue Aug 7 11:51:00 2012 -0700

----------------------------------------------------------------------
 api/src/com/cloud/user/UserContext.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/629556c7/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 aa4c639..b140728 100644
--- a/api/src/com/cloud/user/UserContext.java
+++ b/api/src/com/cloud/user/UserContext.java
@@ -16,12 +16,13 @@
 // 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 final ComponentLocator locator = ComponentLocator.getCurrentLocator();
+    private static final ComponentLocator locator = ComponentLocator.getLocator(ManagementService.Name);
     private static final AccountService _accountMgr = locator.getManager(AccountService.class);
 
     private long userId;


Mime
View raw message