commit e463deb737931874166d43e84122074906e314db
author Edwin Kempin <ekempin@google.com> Fri Oct 15 07:39:03 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 15 07:39:03 2021 +0000
tree e258aa1523c21d207e63dc18a5aeb536459845d3
parent afe41c578d03ea38ecd0f90fa4461c44793b66d4
parent 50c6086d33a71107080fe323038d3810145b865e

Merge "Fix NPE in SubmitRequirementsAdapter"

java/com/google/gerrit/server/project/SubmitRequirementsAdapter.java

diff --git a/java/com/google/gerrit/server/project/SubmitRequirementsAdapter.java b/java/com/google/gerrit/server/project/SubmitRequirementsAdapter.java
index 63a29cc..7252fe9 100644
--- a/java/com/google/gerrit/server/project/SubmitRequirementsAdapter.java
+++ b/java/com/google/gerrit/server/project/SubmitRequirementsAdapter.java
@@ -63,7 +63,7 @@
   static List<SubmitRequirementResult> createResult(
       SubmitRecord record, List<LabelType> labelTypes, ObjectId psCommitId) {
     List<SubmitRequirementResult> results;
-    if (record.ruleName.equals("gerrit~DefaultSubmitRule")) {
+    if (record.ruleName != null && record.ruleName.equals("gerrit~DefaultSubmitRule")) {
       results = createFromDefaultSubmitRecord(record.labels, labelTypes, psCommitId);
     } else {
       results = createFromCustomSubmitRecord(record, psCommitId);
@@ -100,12 +100,13 @@
 
   private static List<SubmitRequirementResult> createFromCustomSubmitRecord(
       SubmitRecord record, ObjectId psCommitId) {
+    String ruleName = record.ruleName != null ? record.ruleName : "Custom-Rule";
     if (record.labels == null || record.labels.isEmpty()) {
       SubmitRequirement sr =
           SubmitRequirement.builder()
-              .setName(record.ruleName)
+              .setName(ruleName)
               .setSubmittabilityExpression(
-                  SubmitRequirementExpression.create(String.format("rule:%s", record.ruleName)))
+                  SubmitRequirementExpression.create(String.format("rule:%s", ruleName)))
               .setAllowOverrideInChildProjects(false)
               .build();
       return ImmutableList.of(
@@ -114,15 +115,13 @@
               .submitRequirement(sr)
               .submittabilityExpressionResult(
                   createExpressionResult(
-                      sr.submittabilityExpression(),
-                      mapStatus(record),
-                      ImmutableList.of(record.ruleName)))
+                      sr.submittabilityExpression(), mapStatus(record), ImmutableList.of(ruleName)))
               .patchSetCommitId(psCommitId)
               .build());
     }
     ImmutableList.Builder<SubmitRequirementResult> result = ImmutableList.builder();
     for (Label label : record.labels) {
-      String expressionString = String.format("label:%s=%s", label.label, record.ruleName);
+      String expressionString = String.format("label:%s=%s", label.label, ruleName);
       SubmitRequirement sr =
           SubmitRequirement.builder()
               .setName(label.label)