From 629556c708a731a994ffb20a4e7189313c7b4196 Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Tue, 7 Aug 2012 11:50:26 -0700
Subject: [PATCH] Fixed UserContext initialization - got broken by unittest

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

diff --git a/api/src/com/cloud/user/UserContext.java b/api/src/com/cloud/user/UserContext.java
index aa4c6393a06..b140728e596 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;