From 123e9f81ab2740340f31e39f1784c660fcf42f90 Mon Sep 17 00:00:00 2001
From: Will Stevens <williamstevens@gmail.com>
Date: Fri, 27 May 2016 16:32:20 -0400
Subject: [PATCH] fixed a variable name broken by merge conflicts

---
 server/src/com/cloud/api/ApiServer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 9c296cb4b51..0651d1671c7 100644
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -1003,7 +1003,7 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer
             final Map<String, Object[]> requestParameters) throws CloudAuthenticationException {
         // We will always use domainId first. If that does not exist, we will use domain name. If THAT doesn't exist
         // we will default to ROOT
-        final Domain userDomain = _domainMgr.findDomainByIdOrPath(domainId, domainPath);
+        final Domain userDomain = domainMgr.findDomainByIdOrPath(domainId, domainPath);
         if (userDomain == null || userDomain.getId() < 1L) {
             throw new CloudAuthenticationException("Unable to find the domain from the path " + domainPath);
         } else {