commit 02ea60c5610e2585cc71bfeafd972ce99c69b1fc
author Patrick Hiesel <hiesel@google.com> Mon Jan 14 16:24:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 14 16:24:50 2019 +0000
tree fd3331250b65c82545ebda444ccf88b02fbb82b3
parent 9a87c23c98a633b79f98b3b6179cc347ede3153f
parent fd367f661de2b9888f35a143d1d6830a5ed24b64

Merge "Test for null values in DefaultRefFilter"

java/com/google/gerrit/server/permissions/DefaultRefFilter.java

diff --git a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java
index 56c22e1..a2a0ef1 100644
--- a/java/com/google/gerrit/server/permissions/DefaultRefFilter.java
+++ b/java/com/google/gerrit/server/permissions/DefaultRefFilter.java
@@ -22,6 +22,7 @@
 import static java.util.stream.Collectors.toMap;
 
 import com.google.common.collect.ImmutableSet;
+import com.google.common.flogger.FluentLogger;
 import com.google.gerrit.common.Nullable;
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.metrics.Counter0;
@@ -62,6 +63,8 @@
 import org.eclipse.jgit.lib.SymbolicRef;
 
 class DefaultRefFilter {
+  private static final FluentLogger logger = FluentLogger.forEnclosingClass();
+
   interface Factory {
     DefaultRefFilter create(ProjectControl projectControl);
   }
@@ -311,9 +314,15 @@
 
     Project.NameKey project = projectState.getNameKey();
     try {
-      ChangeData cd =
-          changeCache.getChangeData(
-              project, changeId, repo.exactRef(RefNames.changeMetaRef(changeId)).getObjectId());
+      Ref metaRef = repo.exactRef(RefNames.changeMetaRef(changeId));
+      if (metaRef == null) {
+        logger.atWarning().log(
+            "can't read change meta ref for change %s on project %s", project, changeId);
+        inVisibleChanges.add(changeId);
+        return false;
+      }
+
+      ChangeData cd = changeCache.getChangeData(project, changeId, metaRef.getObjectId());
       ChangeNotes notes = changeNotesFactory.createFromIndexedChange(cd.change());
       try {
         permissionBackendForProject.indexedChange(cd, notes).check(ChangePermission.READ);