(cloudstack) branch main updated: Fix build

[nvazquez]

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 47a6b7011d7 Fix build
47a6b7011d7 is described below

commit 47a6b7011d7e42be86a748af50b87633147b5a90
Author: nvazquez <nicovazque...@gmail.com>
AuthorDate: Tue Aug 6 13:03:31 2024 -0300

    Fix build
---
 server/src/main/java/com/cloud/acl/DomainChecker.java       | 8 ++++----
 server/src/main/java/com/cloud/user/AccountManagerImpl.java | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/server/src/main/java/com/cloud/acl/DomainChecker.java 
b/server/src/main/java/com/cloud/acl/DomainChecker.java
index b81a3e57ad0..e9f60ea7aa1 100644
--- a/server/src/main/java/com/cloud/acl/DomainChecker.java
+++ b/server/src/main/java/com/cloud/acl/DomainChecker.java
@@ -234,7 +234,7 @@ public class DomainChecker extends AdapterBase implements 
SecurityChecker {
 
         Account owner = _accountDao.findById(entity.getAccountId());
         if (owner == null) {
-            s_logger.error(String.format("Owner not found for %s", entityLog));
+            logger.error(String.format("Owner not found for %s", entityLog));
             throw exception;
         }
 
@@ -248,12 +248,12 @@ public class DomainChecker extends AdapterBase implements 
SecurityChecker {
             // only project owner can delete/modify the project
             if (accessType == AccessType.ModifyProject) {
                 if (!_projectMgr.canModifyProjectAccount(caller, 
owner.getId())) {
-                    s_logger.error(String.format("Caller ID: %d does not have 
permission to modify project with " +
+                    logger.error(String.format("Caller ID: %d does not have 
permission to modify project with " +
                             "owner ID: %d", caller.getId(), owner.getId()));
                     throw exception;
                 }
             } else if (!_projectMgr.canAccessProjectAccount(caller, 
owner.getId())) {
-                s_logger.error(String.format("Caller ID: %d does not have 
permission to access project with " +
+                logger.error(String.format("Caller ID: %d does not have 
permission to access project with " +
                         "owner ID: %d", caller.getId(), owner.getId()));
                 throw exception;
             }
@@ -261,7 +261,7 @@ public class DomainChecker extends AdapterBase implements 
SecurityChecker {
             return;
         }
 
-        s_logger.error(String.format("Caller ID: %d does not have permission 
to access %s", caller.getId(), entityLog));
+        logger.error(String.format("Caller ID: %d does not have permission to 
access %s", caller.getId(), entityLog));
         throw exception;
     }
 
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java 
b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
index a5a1b7aae69..dcb12cbdb74 100644
--- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -2783,7 +2783,7 @@ public class AccountManagerImpl extends ManagerBase 
implements AccountManager, M
     protected void preventRootDomainAdminAccessToRootAdminKeys(User caller, 
ControlledEntity account) {
         if (isDomainAdminForRootDomain(caller) && 
isRootAdmin(account.getAccountId())) {
             String msg = String.format("Caller Username %s does not have 
access to root admin keys", caller.getUsername());
-            s_logger.error(msg);
+            logger.error(msg);
             throw new PermissionDeniedException(msg);
         }
     }