From 543f4d8cf45b88dda8b18e97582a7be35bcf7b2f Mon Sep 17 00:00:00 2001
From: Patrick Hiesel <hiesel@google.com>
Date: Thu, 9 Nov 2017 13:06:31 +0100
Subject: [PATCH] Fix static analysis warnings

Change-Id: I9e2d4cc566fce473078b6282b3576e75496256f1
---
 java/com/google/gerrit/server/project/SetParent.java            | 2 +-
 .../com/google/gerrit/acceptance/rest/project/AccessIT.java     | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/java/com/google/gerrit/server/project/SetParent.java b/java/com/google/gerrit/server/project/SetParent.java
index 5fb8353836..60efa6f312 100644
--- a/java/com/google/gerrit/server/project/SetParent.java
+++ b/java/com/google/gerrit/server/project/SetParent.java
@@ -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()));
     }
diff --git a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
index 0044b68709..eadacb46f1 100644
--- a/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
+++ b/javatests/com/google/gerrit/acceptance/rest/project/AccessIT.java
@@ -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;