Skip to content

Commit 47a6b70

Browse files
committed
Fix build
1 parent b73f634 commit 47a6b70

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

server/src/main/java/com/cloud/acl/DomainChecker.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ protected void validateCallerHasAccessToEntityOwner(Account caller, ControlledEn
234234

235235
Account owner = _accountDao.findById(entity.getAccountId());
236236
if (owner == null) {
237-
s_logger.error(String.format("Owner not found for %s", entityLog));
237+
logger.error(String.format("Owner not found for %s", entityLog));
238238
throw exception;
239239
}
240240

@@ -248,20 +248,20 @@ protected void validateCallerHasAccessToEntityOwner(Account caller, ControlledEn
248248
// only project owner can delete/modify the project
249249
if (accessType == AccessType.ModifyProject) {
250250
if (!_projectMgr.canModifyProjectAccount(caller, owner.getId())) {
251-
s_logger.error(String.format("Caller ID: %d does not have permission to modify project with " +
251+
logger.error(String.format("Caller ID: %d does not have permission to modify project with " +
252252
"owner ID: %d", caller.getId(), owner.getId()));
253253
throw exception;
254254
}
255255
} else if (!_projectMgr.canAccessProjectAccount(caller, owner.getId())) {
256-
s_logger.error(String.format("Caller ID: %d does not have permission to access project with " +
256+
logger.error(String.format("Caller ID: %d does not have permission to access project with " +
257257
"owner ID: %d", caller.getId(), owner.getId()));
258258
throw exception;
259259
}
260260
checkOperationPermitted(caller, entity);
261261
return;
262262
}
263263

264-
s_logger.error(String.format("Caller ID: %d does not have permission to access %s", caller.getId(), entityLog));
264+
logger.error(String.format("Caller ID: %d does not have permission to access %s", caller.getId(), entityLog));
265265
throw exception;
266266
}
267267

server/src/main/java/com/cloud/user/AccountManagerImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2783,7 +2783,7 @@ public Map<String, String> getKeys(Long userId) {
27832783
protected void preventRootDomainAdminAccessToRootAdminKeys(User caller, ControlledEntity account) {
27842784
if (isDomainAdminForRootDomain(caller) && isRootAdmin(account.getAccountId())) {
27852785
String msg = String.format("Caller Username %s does not have access to root admin keys", caller.getUsername());
2786-
s_logger.error(msg);
2786+
logger.error(msg);
27872787
throw new PermissionDeniedException(msg);
27882788
}
27892789
}

0 commit comments

Comments
 (0)