opendev/gerrit
Code Issues Proposed changes

Fix static analysis warnings

Browse Source 
Change-Id: I9e2d4cc566fce473078b6282b3576e75496256f1
This commit is contained in:
Patrick Hiesel
2017-11-09 13:06:31 +01:00
parent e5ca19cf4b
commit 543f4d8cf4
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/project/SetParent.java
View File

@@ -114,7 +114,7 @@ public class SetParent implements RestModifyView<ProjectResource, ParentInput> {
permissionBackend.user(user).check(GlobalPermission.ADMINISTRATE_SERVER);
}
if (project.equals(allUsers) && !allProjects.equals(newParent)) {
if (project.equals(allUsers) && !allProjects.get().equals(newParent)) {
throw new BadRequestException(
String.format("%s must inherit from %s", allUsers.get(), allProjects.get()));
}

2
javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
View File

@@ -39,7 +39,6 @@ import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.Project;
import com.google.gerrit.reviewdb.client.RefNames;
import com.google.gerrit.server.config.AllProjectsName;
import com.google.gerrit.server.config.AllProjectsNameProvider;
import com.google.gerrit.server.config.AllUsersName;
import com.google.gerrit.server.git.ProjectConfig;
@@ -65,7 +64,6 @@ public class AccessIT extends AbstractDaemonTest {
private static final String LABEL_CODE_REVIEW = "Code-Review";
@Inject private AllProjectsName allProjects;
@Inject private AllUsersName allUsers;
private String newProjectName;