Skip to content

NPE correction when informing removed project in the 'listProjectRoles' #13022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tonitzpp wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −5
Open

NPE correction when informing removed project in the 'listProjectRoles' #13022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions ...rc/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Collections;
import java.util.List;

import com.cloud.exception.InvalidParameterValueException;
import org.apache.cloudstack.acl.ProjectRole;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
Expand Down Expand Up @@ -55,7 +56,6 @@ public class ListProjectRolesCmd extends BaseListCmd {
/////////////////// Accessors ///////////////////////
/////////////////////////////////////////////////////


public Long getProjectRoleId() { return projectRoleId; }

public Long getProjectId() {
Expand All @@ -72,7 +72,10 @@ public String getRoleName() {

@Override
public void execute() {
List<ProjectRole> projectRoles = new ArrayList<>();
if (getProjectId() != null && _projectService.getProject(getProjectId()) == null) {
Copy link
Copy Markdown
Contributor

@DaanHoogland DaanHoogland Apr 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the special case projectId = -1 is neglected this way. It looks like it is not applicable for ListProjectRoles, but in general that value is allowed. Can you check how to handle it?

throw new InvalidParameterValueException("Failed to find project by ID.");
}
Comment on lines +75 to +77
Comment on lines +75 to +77
List<ProjectRole> projectRoles;
if (getProjectId() != null && getProjectRoleId() != null) {
projectRoles = Collections.singletonList(projRoleService.findProjectRole(getProjectRoleId(), getProjectId()));
} else if (StringUtils.isNotBlank(getRoleName())) {
Expand Down
6 changes: 3 additions & 3 deletions server/src/main/java/org/apache/cloudstack/acl/ProjectRoleManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ public ProjectRole findProjectRole(Long roleId, Long projectId) {

@Override
public List<ProjectRole> findProjectRoles(Long projectId, String keyword) {
if (projectId == null || projectId < 1L || projectDao.findById(projectId) == null) {
logger.warn("Invalid project ID provided");
return null;
if (projectId == null) {
logger.warn("Invalid project ID provided; thus, an empty list is being returned.");
return Collections.emptyList();
}
return ListUtils.toListOfInterface(projRoleDao.findAllRoles(projectId, keyword));
}
Expand Down
Loading